diff -r cef7e00e6981 -r 354d5b0553f4 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Sun May 30 16:37:01 2010 +0100
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
 <!ELEMENT SystemDefinition ( systemModel )>
 <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
@@ -73,7 +72,7 @@
   priority CDATA #IMPLIED
 >
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
@@ -2264,6 +2263,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">
@@ -4544,7 +4546,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>
@@ -4567,9 +4569,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>
@@ -7967,51 +7966,11 @@
 </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>
+<!-- <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"/>
@@ -8103,24 +8062,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">
@@ -8736,9 +8677,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">
@@ -9902,65 +9840,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">
@@ -10761,9 +10641,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"/>