# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1276257587 -3600
# Node ID 51a1588268decc108fdd1b4111aa21cf5f737f71
# Parent  9e51ca8f91d2c8ed8ca5b913cf4deec4335f3280
Remove spurious ossrv_pub components related to Glib
Remove test components in networkingsrv
Remove SIMTSY as it's a test component in cellularsrv

diff -r 9e51ca8f91d2 -r 51a1588268de symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:38:37 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 12:59:47 2010 +0100
@@ -1,78 +1,78 @@
 <?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
->
-]>
+<!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">
@@ -444,174 +444,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>
@@ -724,7 +556,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>
@@ -1148,7 +980,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>
@@ -1162,7 +994,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>
@@ -1580,12 +1412,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">
@@ -1755,9 +1581,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>
@@ -2154,7 +1977,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"/>
@@ -2610,8 +2433,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>
@@ -2951,7 +2774,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"/> -->
@@ -4031,8 +3854,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"/>
@@ -5194,9 +5017,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">
@@ -5404,15 +5227,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"/>
@@ -5984,7 +5807,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>
@@ -6964,10 +6787,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"/>
@@ -7136,7 +6959,7 @@
 <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component name="contentpublishingsrv_rom" filter="s60" long-name="Content Publishing Service ROM">
-<!-- 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>
@@ -7612,7 +7435,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>
@@ -7638,7 +7461,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>
@@ -8617,8 +8440,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="sf_build" long-name="Image Editor Provider">
@@ -8652,8 +8475,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="sf_build" long-name="Image Editor Utilities">
@@ -8694,10 +8517,10 @@
 <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
 </component>
 <component name="manualvideoeditor" filter="sf_build" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
+<!--  uncomment when supported
+      	<meta rel="config">
+      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
+      	</meta>
         <unit bldFile="videditor/manualvideoeditor/group"/> -->
 </component>
 <component name="videditor_build" filter="sf_build" long-name="Video Editor Build" introduced="^2">