--- a/CompilerCompatibility/mw/locationsrv/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/mw/locationsrv/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,99 +54,183 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
-    <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="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-     </component>
-     <component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
-      <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/locationmapnavfw/library/group"/>
-     </component>
-     <component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-      <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/supl/locationsuplfw/group"/>
-     </component>
-     <component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
-      <unit bldFile="/sf/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-     </component>
-     <component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
-      <unit bldFile="/sf/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="/sf/mw/locationsrv/locationtriggering/ltlogger/group"/>
-     </component>
-     <component name="ltclientlib" filter="s60" long-name="LT Client Library">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltclientlib/group"/>
-     </component>
-     <component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-     </component>
-     <component name="ltcontainer" filter="s60" long-name="LT Container">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcontainer/group"/>
-     </component>
-     <component name="ltserver" filter="s60" long-name="LT Server">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltserver/group"/>
-     </component>
-     <component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-     </component>
-     <component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-     </component>
-     <component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-     </component>
-     <component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-     </component>
-     <component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-     </component>
-     <component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
-      <unit bldFile="/sf/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="/sf/mw/locationsrv/locationtriggering/group"/>
-     </component>
-    </collection>
-    <collection name="locationsrv_info" long-name="Location Services Info" level="if">
-     <component name="locsrv_plat" filter="s60" long-name="Location Services Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/locationsrv/locsrv_plat/group"/>
-     </component>
-     <component name="locsrv_pub" filter="s60" long-name="Location Services Public Interfaces" class="api">
-      <unit bldFile="/sf/mw/locationsrv/locsrv_pub/group"/>
-     </component>
-    </collection>
-   </block>
+<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="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+<unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
+<unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+</component>
+<component name="locationsuplpsy" filter="s60" long-name="Location SUPL PSY" introduced="^3" plugin="Y">
+<unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/locationmapnavfw/library/group"/>
+</component>
+<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
+<unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/supl/locationsuplfw/group"/>
+</component>
+<component name="locationomasuplprotocolhandler" filter="s60" long-name="OMA SUPL Protocol Handler">
+<unit bldFile="/sf/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+</component>
+<component name="supltiapiimplementation" filter="s60" long-name="SUPL TI API Implementation" introduced="^3">
+<unit bldFile="/sf/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="/sf/mw/locationsrv/locationtriggering/ltlogger/group"/>
+</component>
+<component name="ltclientlib" filter="s60" long-name="LT Client Library">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltclientlib/group"/>
+</component>
+<component name="ltmanagementlib" filter="s60" long-name="LT Management Library">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+</component>
+<component name="ltcontainer" filter="s60" long-name="LT Container">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcontainer/group"/>
+</component>
+<component name="ltserver" filter="s60" long-name="LT Server">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltserver/group"/>
+</component>
+<component name="ltstrategypluginapi" filter="s60" long-name="LT Strategy Plugin API">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+</component>
+<component name="ltstrategyengine" filter="s60" long-name="LT Strategy Engine">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+</component>
+<component name="ltmovementdetectionpluginapi" filter="s60" long-name="Movement Detection Plugin API">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+</component>
+<component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+</component>
+<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
+<unit bldFile="/sf/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
+</component>
+<component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
+<unit bldFile="/sf/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="/sf/mw/locationsrv/locationtriggering/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file