# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272035685 -3600
# Node ID 621e7a39919a2bb968316090594b83e477d50b3a
# Parent  4b422c146eb7aadc53031b2a1b98fa5273c15202
Update model and SVG files from HighFidelityModel branch at rev 513cd446dccb

diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Apr 23 16:14:45 2010 +0100
@@ -1238,20 +1238,10 @@
 <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="networkprotoutils" name="Network Protocol Common Utilities" introduced="^3">
-<unit bldFile="/os/lbs/networkprotocolmodules/common/utils/group"/>
-</component>
-<component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" filter="sf_build" introduced="^3" purpose="optional" class="plugin">
-<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup"/>
-</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" filter="sf_build" 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">
@@ -1723,6 +1713,11 @@
 <unit mrp="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
 </component>
 </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">
@@ -2741,22 +2736,22 @@
 <unit base="/os/deviceplatformrelease/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 -->
+<!-- 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">
+<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">
+<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 
-    <collection id="s60bld" name="S60 Build">
-      <component id="buildplatforms" filter="s60" name="Build Platforms">
-        <unit bldFile="/tools/buildplatforms/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"/>
@@ -3578,13 +3573,13 @@
 <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>
-<component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60">
-<!-- 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 id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
 <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
@@ -4978,10 +4973,10 @@
 <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">
+<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">
+<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>
@@ -6592,7 +6587,7 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit bldFile="/mw/qt/."/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
@@ -8065,7 +8060,7 @@
 <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">
+<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">
@@ -9739,7 +9734,7 @@
 <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="S^3" purpose="optional">
+<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>
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Fri Apr 23 16:14:45 2010 +0100
@@ -2557,33 +2557,18 @@
        </g>
       </g>
       <g id="networkprotocolmodules" transform="translate(17.7 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">Network Protocol Modules</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">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="networkprotoutils" 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">Network Protocol Common Utilities</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="18.6" 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="23.25">SUPL Proxy 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="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>
+         <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>
         </g>
        </g>
       </g>
@@ -3413,6 +3398,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
+      <g id="wapstack" transform="translate(77.7 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">WAP Stack</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wapmessageapi" 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; "/>
+         <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">WAP Message API</text>
+        </g>
+       </g>
+      </g>
      </g>
     </g>
     <g id="bt" class="package" transform="translate( 2481.899999999999 0)">
@@ -5066,7 +5063,7 @@
      <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>
      <g transform="translate(0 3.2)">
-      <g id="s60extras" transform="translate(0 18.8)" class="collection">
+      <g id="s60extras" transform="translate(0 37.6)" 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">S60 Extras</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5078,7 +5075,7 @@
         </g>
        </g>
       </g>
-      <g id="locfiles" transform="translate(17.7 18.8)" class="collection">
+      <g id="locfiles" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Locale Files</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5170,7 +5167,7 @@
         </g>
        </g>
       </g>
-      <g id="version" transform="translate(0 0)" class="collection">
+      <g id="version" transform="translate(0 18.8)" 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">Version</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5182,7 +5179,7 @@
         </g>
        </g>
       </g>
-      <g id="helps_loc2" transform="translate(17.7 0)" class="collection">
+      <g id="helps_loc2" transform="translate(17.7 18.8)" 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">Helps Locale 2</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5193,7 +5190,7 @@
         </g>
        </g>
       </g>
-      <g id="sf_config" transform="translate(177.9 18.8)" class="collection">
+      <g id="sf_config" transform="translate(177.9 37.6)" 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">SF Config</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5223,7 +5220,18 @@
         </g>
        </g>
       </g>
-      <g id="symbianosbld" transform="translate(0 37.6)" class="collection">
+      <g id="s60bld" 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">S60 Build</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="buildplatforms" 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">Build Platforms</text>
+        </g>
+       </g>
+      </g>
+      <g id="symbianosbld" transform="translate(0 56.400000000000006)" 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">Symbian OS Build</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5247,7 +5255,7 @@
         </g>
        </g>
       </g>
-      <g id="foundation_system" transform="translate(35.4 0)" class="collection">
+      <g id="foundation_system" transform="translate(35.4 18.8)" 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">Found­ation System</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5259,7 +5267,7 @@
         </g>
        </g>
       </g>
-      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 18.8)" 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">Dev­ice Platform Release Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6677,15 +6685,15 @@
          <use width="9.3" height="9.3" x="195.30000000000007" 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="199.95000000000007">OMA SUPL ASN Codec Plugin API</text>
         </g>
-        <g id="location_local_variation_api" class="component">
+        <g id="query_and_notification_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="204.60000000000008" 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="209.25000000000009">Location Local Variation API</text>
-        </g>
-        <g id="query_and_notification_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Query and Notification API</text>
+        </g>
+        <g id="location_local_variation_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="213.9000000000001" 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="218.5500000000001">Query and Notification API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Location Local Variation API</text>
         </g>
        </g>
       </g>
@@ -17114,7 +17122,7 @@
         </g>
         <g id="chinesecalendaralg" 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" 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="23.25">Chinese Calendar Algorithm</text>
         </g>
        </g>
@@ -20119,7 +20127,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 (169)</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 (170)</text>
       </g>
      </g>
     </g>
@@ -20153,8 +20161,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">666 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2911 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">668 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2910 Components</tspan>
     </text>
    </g>
   </g>
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/sf3c.svg
--- a/symbian3/single/sysdefs/sf3c.svg	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Fri Apr 23 16:14:45 2010 +0100
@@ -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(59.74999999999993 3.2)">
-   <rect x="-46.94999999999993" class="layer" y="-3.2" width="1343.0999999999997" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(50.899999999999906 3.2)">
+   <rect x="-38.09999999999991" class="layer" y="-3.2" width="1343.0999999999997" 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"/>
@@ -998,8 +998,8 @@
     </g>
     <g id="cellularsrv" class="package" transform="translate( 619.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="51" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Cellular Baseband Services</text>
+     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Cellular Baseband Services</text>
      <g transform="translate(0 3.2)">
       <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1056,9 +1056,14 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
+      <g id="wapstack" transform="translate(53.099999999999994 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">WAP Stack</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 672.6 0)">
+    <g id="bt" class="package" transform="translate( 690.3 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="68.7" height="120.23000000000002" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Blue­tooth</text>
@@ -1110,7 +1115,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 743.4 0)">
+    <g id="usb" class="package" transform="translate( 761.0999999999999 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>
@@ -1132,7 +1137,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 773.4 0)">
+    <g id="mm" class="package" transform="translate( 791.0999999999999 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="86.4" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Multi­media</text>
@@ -1224,7 +1229,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 861.9 0)">
+    <g id="imagingext" class="package" transform="translate( 879.5999999999999 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="51" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Imaging Exten­sions</text>
@@ -1251,7 +1256,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 915 0)">
+    <g id="graphics" class="package" transform="translate( 932.6999999999999 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="104.1" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="104.1" x="52.05" y="119.23000000000002">Graphics</text>
@@ -1348,7 +1353,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 1021.1999999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 1038.8999999999999 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="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Text &amp; Localis­ation Services</text>
@@ -1400,7 +1405,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 1091.9999999999998 0)">
+    <g id="xmlsrv" class="package" transform="translate( 1109.6999999999998 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="33.3" height="120.23000000000002" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">XML Services</text>
@@ -1427,54 +1432,59 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 1127.3999999999999 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 1145.1 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="68.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
-      <g id="s60extras" transform="translate(0 18.8)" class="collection">
+      <g id="s60extras" transform="translate(0 37.6)" 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">S60 Extras</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locfiles" transform="translate(17.7 18.8)" class="collection">
+      <g id="locfiles" transform="translate(17.7 37.6)" 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">Locale Files</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="version" transform="translate(0 0)" class="collection">
+      <g id="version" 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">Version</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="helps_loc2" transform="translate(17.7 0)" class="collection">
+      <g id="helps_loc2" 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">Helps Locale 2</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="sf_config" transform="translate(35.4 18.8)" class="collection">
+      <g id="sf_config" transform="translate(35.4 37.6)" 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">SF Config</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="symbianosbld" transform="translate(0 37.6)" class="collection">
+      <g id="s60bld" 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">S60 Build</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="symbianosbld" 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">Symbian OS Build</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="foundation_system" transform="translate(35.4 0)" class="collection">
+      <g id="foundation_system" transform="translate(35.4 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">Found­ation System</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 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">Dev­ice Platform Release Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 1198.1999999999998 0)">
+    <g id="osrndtools" class="package" transform="translate( 1215.8999999999999 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">OS R&amp;D tools</text>
@@ -4622,7 +4632,7 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
      <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
-     <tspan dy="1em" x="243.275">666 Collections</tspan>
+     <tspan dy="1em" x="243.275">668 Collections</tspan>
     </text>
    </g>
   </g>
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Fri Apr 23 16:14:45 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 4902.5 847.4714176753633" 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 4902.5 872.6714176753632" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -423,7 +423,7 @@
 ]]><![CDATA[		
  		}
 	]]></script>
- <g id="os" transform="translate(3.1999999999999993 418.63)" class="layer">
+ <g id="os" transform="translate(3.1999999999999993 443.83000000000004)" 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(549.0500000000006 3.2)">
@@ -2354,28 +2354,18 @@
        </g>
       </g>
       <g id="networkprotocolmodules" transform="translate(17.7 37.6)" 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">Network Protocol Modules</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">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="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="18.6" 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="23.25">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="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">suplcontrolplaneprotocols</text>
+         <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>
         </g>
        </g>
       </g>
@@ -3175,6 +3165,18 @@
         </g>
        </g>
       </g>
+      <g id="wapstack" transform="translate(60.00000000000001 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">WAP Stack</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wapmessageapi" 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; "/>
+         <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">WAP Message API</text>
+        </g>
+       </g>
+      </g>
      </g>
     </g>
     <g id="bt" class="package" transform="translate( 2391.2999999999993 0)">
@@ -5008,7 +5010,7 @@
    </g>
   </g>
  </g>
- <g id="mw" transform="translate(3.1999999999999993 192.63)" class="layer">
+ <g id="mw" transform="translate(3.1999999999999993 217.83)" 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)">
@@ -6083,15 +6085,15 @@
          <use width="9.3" height="9.3" x="195.30000000000007" 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="199.95000000000007">OMA SUPL ASN Codec Plugin API</text>
         </g>
-        <g id="location_local_variation_api" class="component">
+        <g id="query_and_notification_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="204.60000000000008" 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="209.25000000000009">Location Local Variation API</text>
-        </g>
-        <g id="query_and_notification_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Query and Notification API</text>
+        </g>
+        <g id="location_local_variation_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="213.9000000000001" 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="218.5500000000001">Query and Notification API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Location Local Variation API</text>
         </g>
        </g>
       </g>
@@ -13233,7 +13235,7 @@
    </g>
   </g>
  </g>
- <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
+ <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(836.7499999999991 3.2)">
@@ -15261,7 +15263,7 @@
         </g>
         <g id="chinesecalendaralg" 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" 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="23.25">Chinese Calendar Algorithm</text>
         </g>
        </g>
@@ -17570,7 +17572,21 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4595.9795 656.2900000000002) translate(303.3205 0) scale(12.92177745981561) translate(-303.3205)">
+ <g id="tools" 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="22"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="22" height="9.3" x="-11.3">tools</text>
+  <g class="layer-detail" transform="translate(2413.8500000000004 3.2)">
+   <rect x="-2401.05" class="layer" y="-3.2" width="4880.1" height="22"/>
+   <g>
+    <g id="buildplatforms" class="package placeholder" transform="translate( 0 0)">
+     <rect class="package" x="0" width="78" height="15.600000000000001" y="0" style="fill:grey;"/>
+     <text text-anchor="middle" class="package" width="78" x="39" y="7.8" dy="0.375em" height="15.600000000000001">buildplatforms</text>
+     <g/>
+    </g>
+   </g>
+  </g>
+ </g>
+ <g id="legend-root" class="legend" transform="translate(4595.9795 681.49) translate(303.3205 0) scale(12.92177745981561) 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>
@@ -17661,7 +17677,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 (140)</text>
       </g>
      </g>
     </g>
@@ -17694,9 +17710,9 @@
      </g>
     </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">603 Collections</tspan>
-     <tspan dy="1em" x="250.875">2540 Components</tspan>
+     <tspan dy="-1em" x="250.875">109 Packages</tspan>
+     <tspan dy="1em" x="250.875">604 Collections</tspan>
+     <tspan dy="1em" x="250.875">2539 Components</tspan>
     </text>
    </g>
   </g>
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/sf3pkg.svg
--- a/symbian3/single/sysdefs/sf3pkg.svg	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Fri Apr 23 16:14:45 2010 +0100
@@ -551,7 +551,7 @@
     <g id="deviceplatformrelease" class="package" transform="translate( 1281.5999999999997 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="78" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000001" dy="0.375em" height="59.6">Dev­ice Platform Release</text>
+     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000001" dy="0.375em" height="78.4">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)"/>
     </g>
     <g id="osrndtools" class="package" transform="translate( 1361.6999999999996 0)">
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Apr 23 16:14:45 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">
@@ -1282,20 +1281,10 @@
 <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">
@@ -1710,6 +1699,11 @@
 </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">
@@ -2655,22 +2649,22 @@
 <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 -->
+<!-- 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" class="config">
+<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" class="config">
+<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>
+<!-- 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"/>
@@ -3456,13 +3450,13 @@
 <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>
-<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">
@@ -4817,10 +4811,10 @@
 <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">
+<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" class="api">
+<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>
@@ -6296,25 +6290,25 @@
 </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"/>
+<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" proFile="demos.pro" qmakeArgs="-r"/>
+<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" proFile="examples.pro" qmakeArgs="-r"/>
+<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" proFile="qtpauto.pro"/>
+<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" proFile="benchmarks.pro" qmakeArgs="-r"/>
+<unit bldFile="mw/qt/tests/benchmarks"/>
 </component>
 </collection>
 </block>
@@ -7618,7 +7612,7 @@
 <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">
+<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">
@@ -9239,7 +9233,7 @@
 <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">
+<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>
diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 23 16:14:45 2010 +0100
@@ -1221,20 +1221,10 @@
 <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="networkprotoutils" name="Network Protocol Common Utilities" introduced="^3">
-<unit bldFile="/os/lbs/networkprotocolmodules/common/utils/group"/>
-</component>
-<component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" filter="sf_build" introduced="^3" purpose="optional" class="plugin">
-<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup"/>
-</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" filter="sf_build" 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">
 
@@ -1670,6 +1660,11 @@
 
 
 </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">
@@ -2644,22 +2639,22 @@
 <unit base="/os/deviceplatformrelease/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 -->
+<!-- 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">
+<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">
+<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 
-    <collection id="s60bld" name="S60 Build">
-      <component id="buildplatforms" filter="s60" name="Build Platforms">
-        <unit bldFile="/tools/buildplatforms/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"/>
@@ -3471,13 +3466,13 @@
 <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>
-<component id="query_and_notification_api" name="Query and Notification API" class="api" filter="s60">
-<!-- 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 id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
 <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
@@ -4848,10 +4843,10 @@
 <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">
+<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">
+<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>
@@ -6446,7 +6441,7 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit bldFile="/mw/qt/."/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
@@ -7912,7 +7907,7 @@
 <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">
+<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">
@@ -9586,7 +9581,7 @@
 <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="S^3" purpose="optional">
+<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>