--- a/tip_pbc/mw/mds/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/mds/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,121 +50,123 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="mds" level="specific" levels="mgr eng server int" long-name="Metadata Services">
+   <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" purpose="optional" class="api">
+<component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" purpose="optional" class="api">
+<component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
 <unit bldFile="/sf/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" long-name="Metadata Engine Common" introduced="^2" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/mds/metadataengine/common/group"/>
-</component>
-<component name="metadataengine_server" long-name="Metadata Engine Server" introduced="^2" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/mds/metadataengine/server/group"/>
-</component>
-<component name="metadataengine_client" long-name="Metadata Engine Client" introduced="^2" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/mds/metadataengine/client/group"/>
-</component>
-<component name="metadataengine_build" long-name="Metadata Engine Build" introduced="^2" filter="s60" purpose="optional">
-<!--make this collection a single component, or split this bld.inf into the other units  -->
+<component name="metadataengine_build" filter="s60" long-name="Metadata Engine Build" introduced="^2">
+<!--collection is really a component. Move down a directory  -->
 <unit bldFile="/sf/mw/mds/metadataengine/group"/>
 </component>
 </collection>
 <collection name="locationmanager" long-name="Location Manager" level="mgr">
-<component name="locationtrail" long-name="Location Trail" introduced="^2" filter="s60" purpose="optional">
+<component name="geoconverter" filter="s60" long-name="Geoconverter" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/geoconverter/group"/>
+</component>
+<component name="geo_tagcreator" filter="s60" long-name="Geo Tag Creator" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/tagcreator/group"/>
+</component>
+<component name="reversegeocode" filter="s60" long-name="Reverse Geocode" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/ReverseGeocode/group"/>
+</component>
+<component name="reversegeocoderplugin" filter="s60" long-name="Reverse Geo-Coder Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/mds/locationmanager/ReverseGeoCoderPlugin/group"/>
+</component>
+<component name="geotagger" filter="s60" long-name="Geo Tagger" introduced="^4">
+<unit bldFile="/sf/mw/mds/locationmanager/geotagger/group"/>
+</component>
+<component name="locationtrail" filter="s60" long-name="Location Trail" introduced="^2">
 <unit bldFile="/sf/mw/mds/locationmanager/locationtrail/group"/>
 </component>
-<component name="locationmanager_server" long-name="Location Manager Server" introduced="^2" filter="s60" purpose="optional">
+<component name="locationmanager_server" filter="s60" long-name="Location Manager Server" introduced="^2">
 <unit bldFile="/sf/mw/mds/locationmanager/server/group"/>
 </component>
-<component name="locationmanager_client" long-name="Location Manager Client" introduced="^2" filter="s60" purpose="optional">
+<component name="locationmanager_client" filter="s60" long-name="Location Manager Client" introduced="^2">
 <unit bldFile="/sf/mw/mds/locationmanager/client/group"/>
 </component>
-<component name="locationmanager_build" long-name="Location Manager Build" introduced="^2" filter="s60" purpose="optional">
-<!--make this collection a single component, or split this bld.inf into the other units  -->
-<unit bldFile="/sf/mw/mds/locationmanager/group"/>
+<component name="locationmanager_data" filter="s60" long-name="Location Manager Data" introduced="^2">
+<unit bldFile="/sf/mw/mds/locationmanager/data"/>
 </component>
 </collection>
 <collection name="contextengine" long-name="Context Engine" level="eng">
-<component name="contextengine_plugins" long-name="Context Engine Plugins" introduced="^2" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/mds/contextengine/plugins/group"/>
-</component>
-<component name="contextengine_build" long-name="Context Engine Build" introduced="^2" filter="s60" purpose="optional">
-<!--make this collection a single component, or make this unit self-contained  -->
+<component name="contextengine_build" filter="s60" long-name="Context Engine Build" introduced="^2">
+<!-- collection is really a component. Move down a directory -->
 <unit bldFile="/sf/mw/mds/contextengine/group"/>
 </component>
 </collection>
 <collection name="harvester" long-name="Harvester" level="eng">
-<component name="blacklistclient" long-name="Blacklist Client" introduced="^2" filter="s60" purpose="optional">
+<component name="blacklistclient" filter="s60" long-name="Blacklist Client" introduced="^2">
 <unit bldFile="/sf/mw/mds/harvester/blacklistclient/group"/>
 </component>
-<component name="blacklistserver" long-name="Blacklist Server" introduced="^2" filter="s60" purpose="optional">
+<component name="blacklistserver" filter="s60" long-name="Blacklist Server" introduced="^2">
 <unit bldFile="/sf/mw/mds/harvester/blacklistserver/group"/>
 </component>
-<component name="harvester_common" long-name="Harvester Common" introduced="^2" filter="s60" purpose="optional">
+<component name="harvester_common" filter="s60" long-name="Harvester Common" introduced="^2">
 <unit bldFile="/sf/mw/mds/harvester/common/group"/>
 </component>
-<component name="composerplugins" long-name="Composer Plugins" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="composerplugins" filter="s60" long-name="Composer Plugins" introduced="^2" plugin="Y">
 <unit bldFile="/sf/mw/mds/harvester/composerplugins/group"/>
 </component>
-<component name="harvesterplugins" long-name="Harvester Plugins" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="harvesterplugins" filter="s60" long-name="Harvester Plugins" introduced="^2" plugin="Y">
 <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/group"/>
 </component>
-<component name="monitorplugins" long-name="Monitor Plugins" introduced="^2" filter="s60" purpose="optional" plugin="Y">
+<component name="monitorplugins" filter="s60" long-name="Monitor Plugins" introduced="^2" plugin="Y">
 <unit bldFile="/sf/mw/mds/harvester/monitorplugins/group"/>
 </component>
-<component name="harvester_server" long-name="Harvester Server" introduced="^2" filter="s60" purpose="optional">
+<component name="harvester_server" filter="s60" long-name="Harvester Server" introduced="^2">
 <unit bldFile="/sf/mw/mds/harvester/server/group"/>
 </component>
-<component name="harvester_client" long-name="Harvester Client" introduced="^2" filter="s60" purpose="optional">
+<component name="harvester_client" filter="s60" long-name="Harvester Client" introduced="^2">
 <unit bldFile="/sf/mw/mds/harvester/client/group"/>
 </component>
-<component name="harvester_build" long-name="Harvester Build" introduced="^2" filter="s60" purpose="optional">
-<!-- split these exports into the other components -->
-<unit bldFile="/sf/mw/mds/harvester/group"/>
+<component name="harvester_data" filter="s60" long-name="Harvester Data" introduced="^2" class="config">
+<!-- consider moving these exports into the other components -->
+<unit bldFile="/sf/mw/mds/harvester/data"/>
 </component>
 </collection>
 <collection name="watchdog" long-name="Watchdog" level="server">
 <!-- collection is really a component. Move down a directory -->
-<component name="mdswatchdog" long-name="Metadata Watchdog" introduced="^2" filter="s60" purpose="optional">
+<component name="mdswatchdog" filter="s60" long-name="Metadata Watchdog" introduced="^2">
 <unit bldFile="/sf/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" long-name="CLF Wrapper Build" introduced="^2" filter="s60" purpose="optional">
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2">
 <unit bldFile="/sf/mw/mds/clfwrapper/group"/>
 </component>
 </collection>
 <collection name="mds_info" long-name="Metadata Services Info" level="int">
-<component name="mds_build" long-name="Metadata Services Build" introduced="^2" filter="s60" purpose="optional">
-<!-- consider distributiing this into the rest of the components in the package -->
-<unit bldFile="/sf/mw/mds/group"/>
+<component name="mds_rom" filter="s60" long-name="Metadata Services ROM" introduced="^2" class="config">
+<!-- consider moving these exports into the other collections -->
+<unit bldFile="/sf/mw/mds/rom"/>
 </component>
 </collection>
 </block>