FCL/sftools/fbf/projects/platforms: changeset 511:41bfba117374

--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Apr 30 14:54:26 2010 +0100
@@ -1088,11 +1088,6 @@
 </collection>
 </package>
 <package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection id="authenticationservices" name="Authentication Services" level="utilities">
-<component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="/os/security/authenticationservices/authenticationserver/group" mrp="/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
 <collection id="authorisation" name="Authorisation" level="utilities">
 <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
@@ -3411,6 +3406,9 @@
 <component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
 <unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
 </component>
+<component id="wmdrm_ota_access_api" name="WMDRM OTA Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
 <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
 <meta rel="config">
 <defined condition="__WINDOWS_MEDIA_DRM"/>
@@ -4296,7 +4294,7 @@
 </component>
 <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
-<unit unitID="tedo.sat_refresh_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
 </component>
 <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
@@ -4318,14 +4316,14 @@
 </component>
 <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
-<unit unitID="tedo.sat_client_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
 </component>
 <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
 </component>
 <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
-<unit unitID="tedo.sat_service_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
 </component>
 <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
@@ -4389,14 +4387,15 @@
 </component>
 <component id="call_information_api" name="Call Information API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
-<unit unitID="tedo.call_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
 </component>
 <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
 <unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
-<unit unitID="tedo.call_remote_party_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
 </component>
 <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
-<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group" filter="test,api_test"/>
 </component>
 </collection>
 <collection id="telutils" name="Telephony Utils" level="generic">
@@ -4417,33 +4416,32 @@
 </collection>
 <collection id="cellular" name="Cellular" level="server">
 <component id="telephonysettings" filter="s60" name="Telephony Settings">
-<unit bldFile="/mw/phonesrv/cellular/telephonysettings/group"/>
+<unit bldFile="/mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+<unit bldFile="/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
 </component>
 <component id="sssettings" filter="s60" name="Supplementary Service Settings">
-<unit bldFile="/mw/phonesrv/cellular/sssettings/group"/>
+<unit bldFile="/mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+<unit bldFile="/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
 </component>
 <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
-<unit bldFile="/mw/phonesrv/cellular/psetnotesui/group"/>
+<unit bldFile="/mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+<unit bldFile="/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
 </component>
 <component id="servicerequest" filter="s60" name="Service Request">
 <unit bldFile="/mw/phonesrv/cellular/servicerequest/group"/>
 </component>
-<component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
-<unit unitID="tedo.PsetNotesUi.test" bldFile="/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
-<unit unitID="tedo.SSSettings.test" bldFile="/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
-<unit unitID="tedo.telephonysettings.test" bldFile="/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group"/>
-</component>
 </collection>
 <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
 <component id="callprovider" filter="s60" name="Call Provider">
 <unit bldFile="/mw/phonesrv/convergedcallengine/callprovider/group"/>
 </component>
 <component id="cce" filter="s60" name="CCE">
-<unit bldFile="/mw/phonesrv/convergedcallengine/cce/group"/>
+<unit bldFile="/mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+<unit filter="test,api_test" bldFile="/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
 </component>
 <component id="spsettings" filter="s60" name="Service Provider Settings">
-<unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group"/>
+<unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+<unit filter="test,api_test" bldFile="/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
 </component>
 <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
 <unit bldFile="/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -4455,11 +4453,6 @@
 <!--  should spell out CS in name -->
 <unit bldFile="/mw/phonesrv/convergedcallengine/csplugin/group"/>
 </component>
-<component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
-<unit unitID="tedo.cce.test" bldFile="/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
-<unit unitID="tedo.spsettings.test" bldFile="/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
-</component>
 </collection>
 <collection id="engines" name="Telephony Engines" level="specific">
 <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
@@ -4476,13 +4469,16 @@
 <unit bldFile="/mw/phonesrv/phoneclientserver/enpolicy/group"/>
 </component>
 <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
-<unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+<unit filter="test,api_test" bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
 </component>
 <component id="dialutils" filter="s60" name="Dial Utils">
-<unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+<unit filter="test,api_test" bldFile="/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
 </component>
 <component id="phoneclient" filter="s60" name="Phone Client">
-<unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+<unit filter="test,api_test" bldFile="/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
 </component>
 <component id="phoneserver" filter="s60" name="Phone Server">
 <unit bldFile="/mw/phonesrv/phoneclientserver/phoneserver/group"/>
@@ -4490,12 +4486,6 @@
 <component id="callui" filter="s60" name="Call UI">
 <unit bldFile="/mw/phonesrv/phoneclientserver/callui/group"/>
 </component>
-<component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
-<unit unitID="tedo.aiwdialdata.test" bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
-<unit unitID="tedo.dialutils.test" bldFile="/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
-<unit unitID="tedo.phoneclient.test" bldFile="/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
-</component>
 </collection>
 <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
 <component id="satserver" filter="s60" name="SAT Server">
@@ -4515,12 +4505,6 @@
 <unit bldFile="/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
 </component>
 </collection>
-<collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
-<component id="phonesrv_test" filter="s60,test,api_test" name="Telephony and SIM Services Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
-<unit unitID="tedo.telephony_mediator_api.test" bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
-</component>
-</collection>
 </package>
 <package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack fw api">
 <collection id="msgfw_pub" name="Messaging Middleware Public Interfaces" level="api">
@@ -9127,6 +9111,17 @@
 </collection>
 </package>
 <package id="printing" level="services" tech-domain="de" name="Printing" levels="app">
+<collection id="DirectPrint" name="DirectPrint" level="app">
+<component id="DirectPrintApp" filter="sf_build" name="DirectPrint App" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component id="DirectPrintServer" filter="sf_build" name="DirectPrint Server" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component id="DirectPrintClient" filter="sf_build" name="DirectPrint Client" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
 <collection id="imageprint" name="ImagePrint" level="app">
 <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
 <unit bldFile="/app/printing/imageprint/clog/group"/>

--- a/symbian3/single/sysdefs/sf3.svg	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Fri Apr 30 14:54:26 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 5085.7999999999975 826.9542039792772" 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 5095.099999999998 827.2891697639165" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 399.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(486.19999999999965 3.2)">
-   <rect x="-473.39999999999964" class="layer" y="-3.2" width="5063.399999999998" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(496.09999999999974 3.2)">
+   <rect x="-483.2999999999997" class="layer" y="-3.2" width="5072.699999999998" 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"/>
@@ -2283,21 +2283,10 @@
     </g>
     <g id="security" class="package" transform="translate( 1791.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="74.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="74.7" x="37.35" y="119.23000000000002">OS Security</text>
-     <g transform="translate(0 3.2)">
-      <g id="authenticationservices" 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">Authentication Services</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="authenticationserver" 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; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Authentication Server</text>
-        </g>
-       </g>
-      </g>
-      <g id="authorisation" transform="translate(17.7 0)" class="collection">
+     <rect class="package" x="0" width="64.2" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="119.23000000000002">OS Security</text>
+     <g transform="translate(0 3.2)">
+      <g id="authorisation" transform="translate(0 0)" class="collection">
        <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">Authorisation</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2313,7 +2302,7 @@
         </g>
        </g>
       </g>
-      <g id="contentmgmt" transform="translate(38.400000000000006 0)" class="collection">
+      <g id="contentmgmt" transform="translate(20.700000000000003 0)" class="collection">
        <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">Content Management</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2430,7 +2419,7 @@
         </g>
        </g>
       </g>
-      <g id="security_info" transform="translate(59.10000000000001 0)" class="collection">
+      <g id="security_info" transform="translate(41.400000000000006 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">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2444,7 +2433,7 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 1868.6999999999994 0)">
+    <g id="lbs" class="package" transform="translate( 1858.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="71.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="71.7" x="35.85" y="119.23000000000002">Locating Services</text>
@@ -2591,7 +2580,7 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 1942.4999999999993 0)">
+    <g id="commsfw" class="package" transform="translate( 1931.9999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="66.30000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="119.23000000000002">Comms Framework</text>
@@ -2758,7 +2747,7 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 2010.8999999999994 0)">
+    <g id="networkingsrv" class="package" transform="translate( 2000.3999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="170.70000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">Networking Services</text>
@@ -3018,7 +3007,7 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 2183.6999999999994 0)">
+    <g id="wlan" class="package" transform="translate( 2173.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="192.6" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="192.6" x="96.3" y="119.23000000000002">WLAN</text>
@@ -3170,7 +3159,7 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 2378.399999999999 0)">
+    <g id="cellularsrv" class="package" transform="translate( 2367.899999999999 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="101.39999999999998" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="119.23000000000002">Cellular Baseband Services</text>
@@ -3412,7 +3401,7 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 2481.899999999999 0)">
+    <g id="bt" class="package" transform="translate( 2471.399999999999 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="81" height="120.23000000000002" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="81" x="40.5" y="119.23000000000002">Bluetooth</text>
@@ -3579,7 +3568,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 2564.999999999999 0)">
+    <g id="usb" class="package" transform="translate( 2554.499999999999 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>
@@ -3620,7 +3609,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 2594.999999999999 0)">
+    <g id="mm" class="package" transform="translate( 2584.499999999999 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="778.1999999999996" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="778.1999999999996" x="389.0999999999998" y="119.23000000000002">Multimedia</text>
@@ -4364,7 +4353,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 3375.299999999999 0)">
+    <g id="imagingext" class="package" transform="translate( 3364.799999999999 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="94.2" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="94.2" x="47.1" y="119.23000000000002">Imaging Extensions</text>
@@ -4450,7 +4439,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3471.599999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3461.099999999999 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="113.1" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="113.1" x="56.55" y="119.23000000000002">Graphics</text>
@@ -4750,7 +4739,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3586.799999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3576.299999999999 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="84" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84" x="42" y="119.23000000000002">Text &amp; Localisation Services</text>
@@ -4943,7 +4932,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3672.8999999999987 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3662.3999999999987 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="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -5058,7 +5047,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3740.0999999999985 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3729.5999999999985 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="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">Device Platform Release</text>
@@ -5281,7 +5270,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3957.2999999999984 0)">
+    <g id="osrndtools" class="package" transform="translate( 3946.7999999999984 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="159.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="119.23000000000002">OS R&amp;D tools</text>
@@ -5506,7 +5495,7 @@
   <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)">
-   <rect x="0" class="layer" y="-3.2" width="5063.399999999998" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="5072.699999999998" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -6357,12 +6346,12 @@
     </g>
     <g id="drm" class="package" transform="translate( 612.3000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="177.89999999999998" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="177.89999999999998" x="88.94999999999999" y="115.00000000000003">DRM</text>
+     <rect class="package" x="0" width="187.2" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="187.2" x="93.6" y="115.00000000000003">DRM</text>
      <g transform="translate(0 3.2)">
       <g id="drm_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">DRM Platform Interfaces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="138.1" height="6.299999999999999">DRM Platform Interfaces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="roap_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -6424,19 +6413,24 @@
          <use width="9.3" height="9.3" x="102.29999999999998" 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="106.94999999999999">WMDRM Access API</text>
         </g>
-        <g id="camese_utility_api" class="component">
+        <g id="wmdrm_ota_access_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="111.59999999999998" 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="116.24999999999999">Camese Utility API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">WMDRM OTA Access API</text>
+        </g>
+        <g id="camese_utility_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="120.89999999999998" 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="125.54999999999998">Camese Utility API</text>
         </g>
         <g id="camese_framework_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="120.89999999999998" 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="125.54999999999998">Camese Framework API</text>
-        </g>
-       </g>
-      </g>
-      <g id="drm_pub" transform="translate(132.29999999999998 0)" class="collection">
+         <use width="9.3" height="9.3" x="130.2" 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="134.85">Camese Framework API</text>
+        </g>
+       </g>
+      </g>
+      <g id="drm_pub" transform="translate(141.6 0)" 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">DRM Public Interfaces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6528,7 +6522,7 @@
         </g>
        </g>
       </g>
-      <g id="drm_info" transform="translate(162.29999999999998 0)" class="collection placeholder">
+      <g id="drm_info" transform="translate(171.6 0)" class="collection placeholder">
        <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">DRM Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -6850,7 +6844,7 @@
       </g>
      </g>
     </g>
-    <g id="accesssec" class="package" transform="translate( 792.3000000000003 100.4)">
+    <g id="accesssec" class="package" transform="translate( 801.6000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="178.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="115.00000000000003">Access Security</text>
@@ -6975,7 +6969,7 @@
       </g>
      </g>
     </g>
-    <g id="ipconnmgmt" class="package" transform="translate( 973.2000000000003 100.4)">
+    <g id="ipconnmgmt" class="package" transform="translate( 982.5000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="272.09999999999997" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="272.09999999999997" x="136.04999999999998" y="115.00000000000003">IP Connectivity Mgmt.</text>
@@ -7254,7 +7248,7 @@
       </g>
      </g>
     </g>
-    <g id="netprotocols" class="package" transform="translate( 1247.4 100.4)">
+    <g id="netprotocols" class="package" transform="translate( 1256.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">High-level Internet Protocols</text>
@@ -7413,7 +7407,7 @@
       </g>
      </g>
     </g>
-    <g id="ipappprotocols" class="package" transform="translate( 1333.2 100.4)">
+    <g id="ipappprotocols" class="package" transform="translate( 1342.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">IP App Protocols</text>
@@ -7971,8 +7965,8 @@
     </g>
     <g id="phonesrv" class="package" transform="translate( 739.2000000000003 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="409.50000000000034" height="97.2" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="373.20000000000033" x="222.90000000000018" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
+     <rect class="package" x="0" width="391.8000000000003" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="355.5000000000003" x="214.05000000000015" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
      <g transform="translate(0 3.2)">
       <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
@@ -8360,14 +8354,9 @@
         </g>
        </g>
       </g>
-      <g id="phonesrv_info" transform="translate(393.9000000000003 0)" class="collection placeholder">
-       <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">Telephony &amp; SIM Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="messagingmw" class="package" transform="translate( 1150.8000000000006 0)">
+     </g>
+    </g>
+    <g id="messagingmw" class="package" transform="translate( 1133.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="147.89999999999998" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="96.2">Messaging Middleware</text>
@@ -8517,7 +8506,7 @@
       </g>
      </g>
     </g>
-    <g id="imsrv" class="package" transform="translate( 1300.8000000000006 0)">
+    <g id="imsrv" class="package" transform="translate( 1283.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="259.50000000000017" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="259.50000000000017" x="129.75000000000009" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
@@ -8718,7 +8707,7 @@
       </g>
      </g>
     </g>
-    <g id="legacypresence" class="package" transform="translate( 1562.4000000000008 0)">
+    <g id="legacypresence" class="package" transform="translate( 1544.7000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="156.29999999999995" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="156.29999999999995" x="78.14999999999998" y="96.2">Legacy Presence Services</text>
@@ -8884,7 +8873,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 1720.8000000000006 0)">
+    <g id="opensrv" class="package" transform="translate( 1703.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
@@ -8956,7 +8945,7 @@
       </g>
      </g>
     </g>
-    <g id="remotemgmt" class="package" transform="translate( 1756.2000000000007 0)">
+    <g id="remotemgmt" class="package" transform="translate( 1738.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="459.00000000000034" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="459.00000000000034" x="229.50000000000017" y="86.2" dy="0.375em">Remote Management</text>
@@ -9339,7 +9328,7 @@
       </g>
      </g>
     </g>
-    <g id="remotestorage" class="package" transform="translate( 1381.8 100.4)">
+    <g id="remotestorage" class="package" transform="translate( 1391.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">Remote Storage</text>
@@ -9410,7 +9399,7 @@
       </g>
      </g>
     </g>
-    <g id="remoteconn" class="package" transform="translate( 1467.6 100.4)">
+    <g id="remoteconn" class="package" transform="translate( 1476.8999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="48.6" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="48.6" x="24.3" y="115.00000000000003">Remote Connectivity</text>
@@ -9526,7 +9515,7 @@
       </g>
      </g>
     </g>
-    <g id="srvdiscovery" class="package" transform="translate( 1518.3 100.4)">
+    <g id="srvdiscovery" class="package" transform="translate( 1527.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="73.49999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="73.49999999999999" x="36.74999999999999" y="115.00000000000003">Service Discovery &amp; Usage</text>
@@ -9603,7 +9592,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 2217.300000000001 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2199.600000000001 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="159.29999999999998" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="86.2" dy="0.375em">DLNA Services</text>
@@ -9946,7 +9935,7 @@
       </g>
      </g>
     </g>
-    <g id="btservices" class="package" transform="translate( 1593.8999999999999 100.4)">
+    <g id="btservices" class="package" transform="translate( 1603.1999999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="176.99999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="176.99999999999997" x="88.49999999999999" y="115.00000000000003">Bluetooth Services</text>
@@ -10140,7 +10129,7 @@
       </g>
      </g>
     </g>
-    <g id="usbservices" class="package" transform="translate( 1772.9999999999998 100.4)">
+    <g id="usbservices" class="package" transform="translate( 1782.2999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="110.69999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="110.69999999999997" x="55.34999999999999" y="115.00000000000003">USB Services</text>
@@ -10296,7 +10285,7 @@
       </g>
      </g>
     </g>
-    <g id="shortlinkconn" class="package" transform="translate( 1885.7999999999997 100.4)">
+    <g id="shortlinkconn" class="package" transform="translate( 1895.0999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="74.39999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="74.39999999999999" x="37.199999999999996" y="115.00000000000003">Shortlink Connectivity</text>
@@ -10395,7 +10384,7 @@
       </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 2378.700000000001 0)">
+    <g id="imghandling" class="package" transform="translate( 2361.000000000001 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="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
@@ -10445,7 +10434,7 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 2408.700000000001 0)">
+    <g id="metadatasrv" class="package" transform="translate( 2391.000000000001 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="67.2" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="86.2" dy="0.375em">Legacy Metadata Services</text>
@@ -10513,7 +10502,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 2478.0000000000014 0)">
+    <g id="mds" class="package" transform="translate( 2460.300000000001 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="143.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="143.7" x="71.85" y="96.2">Metadata Services</text>
@@ -10720,7 +10709,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 2623.8000000000015 0)">
+    <g id="mmuifw" class="package" transform="translate( 2606.1000000000013 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="148.8" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="148.8" x="74.4" y="86.2" dy="0.375em">Multimedia UI Fmwk.</text>
@@ -10919,7 +10908,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 2774.7000000000016 0)">
+    <g id="videoutils" class="package" transform="translate( 2757.0000000000014 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="45.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="96.2">Video Utils</text>
@@ -10984,7 +10973,7 @@
       </g>
      </g>
     </g>
-    <g id="mmmw" class="package" transform="translate( 1962.2999999999997 100.4)">
+    <g id="mmmw" class="package" transform="translate( 1971.5999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="317.4000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="317.4000000000001" x="158.70000000000005" y="115.00000000000003">Multimedia Middleware</text>
@@ -11221,7 +11210,7 @@
       </g>
      </g>
     </g>
-    <g id="helix" class="package" transform="translate( 2281.7999999999997 100.4)">
+    <g id="helix" class="package" transform="translate( 2291.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
@@ -11239,7 +11228,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 2822.4000000000015 0)">
+    <g id="camerasrv" class="package" transform="translate( 2804.700000000001 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="109.79999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="96.2">Camera Services</text>
@@ -11353,7 +11342,7 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 2934.3000000000015 0)">
+    <g id="mmappfw" class="package" transform="translate( 2916.6000000000013 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="234.60000000000008" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="234.60000000000008" x="117.30000000000004" y="96.2">Multimedia App Fmwk.</text>
@@ -11595,7 +11584,7 @@
       </g>
      </g>
     </g>
-    <g id="inputmethods" class="package" transform="translate( 2311.7999999999997 100.4)">
+    <g id="inputmethods" class="package" transform="translate( 2321.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="195.30000000000007" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="195.30000000000007" x="97.65000000000003" y="115.00000000000003">Input Methods</text>
@@ -11814,7 +11803,7 @@
       </g>
      </g>
     </g>
-    <g id="qt" class="package" transform="translate( 2509.2 100.4)">
+    <g id="qt" class="package" transform="translate( 2518.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="115.00000000000003">Qt</text>
@@ -11881,7 +11870,7 @@
       </g>
      </g>
     </g>
-    <g id="classicui" class="package" transform="translate( 2565.2999999999997 100.4)">
+    <g id="classicui" class="package" transform="translate( 2574.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="1511.0999999999988" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="1511.0999999999988" x="755.5499999999994" y="115.00000000000003">Classic UI</text>
@@ -12873,7 +12862,7 @@
       </g>
      </g>
     </g>
-    <g id="svgt" class="package" transform="translate( 4078.4999999999986 100.4)">
+    <g id="svgt" class="package" transform="translate( 4087.799999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
@@ -12912,7 +12901,7 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 4108.499999999999 100.4)">
+    <g id="uiaccelerator" class="package" transform="translate( 4117.799999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">UI Accelerator</text>
@@ -12971,7 +12960,7 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 4166.399999999999 100.4)">
+    <g id="uiresources" class="package" transform="translate( 4175.699999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="280.5" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="280.5" x="140.25" y="105" dy="0.375em">UI Resources</text>
@@ -13236,7 +13225,7 @@
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 4448.999999999999 100.4)">
+    <g id="hapticsservices" class="package" transform="translate( 4458.299999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">Haptics Services</text>
@@ -13322,7 +13311,7 @@
       </g>
      </g>
     </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 4506.899999999999 100.4)">
+    <g id="gsprofilesrv" class="package" transform="translate( 4516.199999999999 100.4)">
      <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.39999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="104.39999999999998" x="52.19999999999999" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
@@ -13433,7 +13422,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 3171.000000000002 0)">
+    <g id="homescreensrv" class="package" transform="translate( 3153.3000000000015 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="195.30000000000007" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="176.70000000000007" x="106.95000000000003" y="29.8" dy="0.375em">Home Screen Services</text>
@@ -13745,7 +13734,7 @@
       </g>
      </g>
     </g>
-    <g id="appinstall" class="package" transform="translate( 4613.399999999999 100.4)">
+    <g id="appinstall" class="package" transform="translate( 4622.699999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="166.79999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="166.79999999999998" x="83.39999999999999" y="115.00000000000003">App Installation</text>
@@ -13945,7 +13934,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 3368.400000000002 0)">
+    <g id="serviceapifw" class="package" transform="translate( 3350.7000000000016 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="101.39999999999998" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="86.2" dy="0.375em">Service API Framework</text>
@@ -14045,7 +14034,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 3471.900000000002 0)">
+    <g id="serviceapi" class="package" transform="translate( 3454.2000000000016 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="120.89999999999998" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="120.89999999999998" x="60.44999999999999" y="96.2">Service API</text>
@@ -14123,7 +14112,7 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 3594.900000000002 0)">
+    <g id="web" class="package" transform="translate( 3577.2000000000016 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="328.8" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="328.8" x="164.4" y="86.2" dy="0.375em">Web</text>
@@ -14525,7 +14514,7 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 4782.299999999998 100.4)">
+    <g id="websrv" class="package" transform="translate( 4791.5999999999985 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="251.10000000000014" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="115.00000000000003">Web Services</text>
@@ -14725,7 +14714,7 @@
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 5035.499999999998 100.4)">
+    <g id="platformtools" class="package" transform="translate( 5044.799999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
@@ -14748,7 +14737,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3925.800000000002 0)">
+    <g id="uitools" class="package" transform="translate( 3908.1000000000017 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="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -14875,8 +14864,8 @@
  <g id="app" 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="170.63000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="170.63000000000002" height="9.3" x="-85.61500000000001">Applications</text>
-  <g class="layer-detail" transform="translate(777.3499999999985 3.2)">
-   <rect x="-764.5499999999986" class="layer" y="-3.2" width="5063.399999999998" height="170.63000000000002"/>
+  <g class="layer-detail" transform="translate(771.1999999999987 3.2)">
+   <rect x="-758.3999999999987" class="layer" y="-3.2" width="5072.699999999998" height="170.63000000000002"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -16066,10 +16055,31 @@
     </g>
     <g id="printing" class="package" transform="translate( 576.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="77.4">Printing</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageprint" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="67.2" height="78.4" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="67.2" x="33.6" y="77.4">Printing</text>
+     <g transform="translate(0 3.2)">
+      <g id="DirectPrint" transform="translate(0 0)" 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">DirectPrint</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="DirectPrintApp" 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; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DirectPrint App</text>
+        </g>
+        <g id="DirectPrintServer" 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">DirectPrint Server</text>
+        </g>
+        <g id="DirectPrintClient" 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">DirectPrint Client</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageprint" transform="translate(30.000000000000004 0)" 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">ImagePrint</text>
        <g transform="translate(0 6.299999999999999)">
@@ -16206,7 +16216,7 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 624.6 0)">
+    <g id="contacts" class="package" transform="translate( 646.1999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="569.7000000000004" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="163.23000000000002">Contacts Apps</text>
@@ -16668,7 +16678,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 1196.4000000000003 0)">
+    <g id="organizer" class="package" transform="translate( 1218.0000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="311.40000000000003" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="311.40000000000003" x="155.70000000000002" y="163.23000000000002">Organizer App Suite</text>
@@ -17141,7 +17151,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 1509.9000000000003 0)">
+    <g id="messaging" class="package" transform="translate( 1531.5000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="356.7000000000001" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="163.23000000000002">Messaging Apps</text>
@@ -17563,7 +17573,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 1868.7000000000005 0)">
+    <g id="commonemail" class="package" transform="translate( 1890.3000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="158.10000000000002" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="158.10000000000002" x="79.05000000000001" y="163.23000000000002">Email Apps</text>
@@ -17826,7 +17836,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 2028.9000000000005 0)">
+    <g id="conversations" class="package" transform="translate( 2050.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="142.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="142.8" x="71.4" y="81.63000000000001">Conversation Apps</text>
@@ -18002,7 +18012,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 2173.8000000000006 0)">
+    <g id="im" class="package" transform="translate( 2195.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
@@ -18031,7 +18041,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 2028.9000000000005 85.83000000000001)">
+    <g id="dictionary" class="package" transform="translate( 2050.5000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="78.4" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="77.4">Dictionary</text>
@@ -18060,7 +18070,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 2203.8000000000006 0)">
+    <g id="camera" class="package" transform="translate( 2225.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="57.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="81.63000000000001">Camera Apps</text>
@@ -18104,7 +18114,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 2262.9000000000005 0)">
+    <g id="imgeditor" class="package" transform="translate( 2284.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Image Editor Apps</text>
@@ -18219,7 +18229,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 2388.0000000000005 0)">
+    <g id="videoeditor" class="package" transform="translate( 2409.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="82.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="81.63000000000001">Video Editor Apps</text>
@@ -18320,7 +18330,7 @@
       </g>
      </g>
     </g>
-    <g id="videoplayer" class="package" transform="translate( 2472.9000000000005 0)">
+    <g id="videoplayer" class="package" transform="translate( 2494.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="81.63000000000001">Video Player Apps</text>
@@ -18550,7 +18560,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 2681.7000000000007 0)">
+    <g id="photos" class="package" transform="translate( 2703.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="178.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="81.63000000000001">Photos</text>
@@ -18664,7 +18674,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 2862.600000000001 0)">
+    <g id="musicplayer" class="package" transform="translate( 2884.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="81.63000000000001">Music Player Apps</text>
@@ -18831,7 +18841,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 3024.000000000001 0)">
+    <g id="radio" class="package" transform="translate( 3045.600000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="65.1" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="81.63000000000001">Radio Apps</text>
@@ -18879,19 +18889,19 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 3091.2000000000007 0)">
+    <g id="internetradio" class="package placeholder" transform="translate( 3112.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 2064.3000000000006 85.83000000000001)">
+    <g id="tv" class="package placeholder" transform="translate( 2085.9000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 3171.3000000000006 0)">
+    <g id="voicerec" class="package" transform="translate( 3192.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
@@ -18930,7 +18940,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 3227.4000000000005 0)">
+    <g id="screensaver" class="package" transform="translate( 3249.0000000000005 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="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -18972,7 +18982,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3257.4000000000005 0)">
+    <g id="homescreen" class="package" transform="translate( 3279.0000000000005 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="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
@@ -19098,7 +19108,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 2144.4000000000005 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 2166.0000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="45.6" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="77.4">Graphics UIs</text>
@@ -19137,7 +19147,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3382.5000000000005 0)">
+    <g id="profile" class="package" transform="translate( 3404.1000000000004 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="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -19177,7 +19187,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 2192.1000000000004 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 2213.7000000000003 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="326.70000000000016" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="326.70000000000016" x="163.35000000000008" y="77.4">Speech Recognition UIs</text>
@@ -19478,7 +19488,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 2520.9000000000005 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 2542.5000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="77.4">Home Screen Tools</text>
@@ -19523,7 +19533,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 2577.0000000000005 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 2598.6000000000004 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="67.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="77.4">Web UIs</text>
@@ -19600,7 +19610,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 2646.3000000000006 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 2667.9000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="48.6" dy="0.375em">Java Runtime</text>
@@ -19669,7 +19679,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 2685.600000000001 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 2707.2000000000007 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="78.4" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="77.4">Connectivity Tools</text>
@@ -19700,7 +19710,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 2715.600000000001 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 2737.2000000000007 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="103.5" height="78.4" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="87.9" x="59.55" y="67.4" dy="0.375em">R&amp;D tools</text>
@@ -19871,7 +19881,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 3435.6000000000004 0)">
+    <g id="helps" class="package" transform="translate( 3457.2000000000003 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="27.900000000000002" height="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="163.23000000000002">Help Apps</text>
@@ -19912,7 +19922,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3465.6000000000004 0)">
+    <g id="techview" class="package" transform="translate( 3487.2000000000003 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="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="163.23000000000002">Techview</text>
@@ -20027,7 +20037,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4764.979499999998 637.4900000000001) translate(317.6205 0) scale(12.801692585963432) translate(-317.6205)">
+ <g id="legend-root" class="legend" transform="translate(4774.279499999998 637.4900000000001) translate(317.6205 0) scale(12.825116766707435) translate(-317.6205)">
   <text text-anchor="middle" class="title" x="301.28525" y="0">
    <tspan dy="0.75em" x="301.28525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="301.28525">System Model</tspan>
@@ -20161,8 +20171,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">668 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2910 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">667 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2913 Components</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/sf3c.svg	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Fri Apr 30 14:54:26 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 1365.4999999999998 689.3961644863986" class="collection-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 1370.8999999999999 689.5597784394387" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -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(50.899999999999906 3.2)">
-   <rect x="-38.09999999999991" class="layer" y="-3.2" width="1343.0999999999997" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(62.449999999999974 3.2)">
+   <rect x="-49.64999999999998" class="layer" y="-3.2" width="1348.4999999999998" 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"/>
@@ -753,20 +753,15 @@
     </g>
     <g id="security" class="package" transform="translate( 283.2 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">OS Security</text>
+     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">OS Security</text>
      <g transform="translate(0 3.2)">
-      <g id="authenticationservices" 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">Authentication Services</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="authorisation" transform="translate(17.7 0)" class="collection">
+      <g id="authorisation" 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">Authorisation</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="contentmgmt" transform="translate(35.4 0)" class="collection">
+      <g id="contentmgmt" transform="translate(17.7 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">Content Management</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -796,14 +791,14 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Crypto Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="security_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="security_info" transform="translate(35.4 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">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 354 0)">
+    <g id="lbs" class="package" transform="translate( 336.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Locating Services</text>
@@ -850,7 +845,7 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 424.8 0)">
+    <g id="commsfw" class="package" transform="translate( 407.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Comms Framework</text>
@@ -902,7 +897,7 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 477.90000000000003 0)">
+    <g id="networkingsrv" class="package" transform="translate( 460.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Networking Services</text>
@@ -964,7 +959,7 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 548.7 0)">
+    <g id="wlan" class="package" transform="translate( 531 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">WLAN</text>
@@ -996,7 +991,7 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 619.5 0)">
+    <g id="cellularsrv" class="package" transform="translate( 601.8 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="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>
@@ -1063,7 +1058,7 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 690.3 0)">
+    <g id="bt" class="package" transform="translate( 672.5999999999999 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">Bluetooth</text>
@@ -1115,7 +1110,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 761.0999999999999 0)">
+    <g id="usb" class="package" transform="translate( 743.3999999999999 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>
@@ -1137,7 +1132,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 791.0999999999999 0)">
+    <g id="mm" class="package" transform="translate( 773.3999999999999 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">Multimedia</text>
@@ -1229,7 +1224,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 879.5999999999999 0)">
+    <g id="imagingext" class="package" transform="translate( 861.8999999999999 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 Extensions</text>
@@ -1256,7 +1251,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 932.6999999999999 0)">
+    <g id="graphics" class="package" transform="translate( 914.9999999999999 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>
@@ -1353,7 +1348,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 1038.8999999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 1021.1999999999999 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; Localisation Services</text>
@@ -1405,7 +1400,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 1109.6999999999998 0)">
+    <g id="xmlsrv" class="package" transform="translate( 1091.9999999999998 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>
@@ -1432,7 +1427,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 1145.1 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 1127.3999999999999 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">Device Platform Release</text>
@@ -1484,7 +1479,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 1215.8999999999999 0)">
+    <g id="osrndtools" class="package" transform="translate( 1198.1999999999998 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>
@@ -1517,8 +1512,8 @@
  <g id="mw" transform="translate(3.1999999999999993 178.06)" 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(28.999999999999705 3.2)">
-   <rect x="-16.199999999999704" class="layer" y="-3.2" width="1343.0999999999997" height="222.8"/>
+  <g class="layer-detail" transform="translate(31.69999999999975 3.2)">
+   <rect x="-18.89999999999975" class="layer" y="-3.2" width="1348.4999999999998" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -2014,8 +2009,8 @@
     </g>
     <g id="phonesrv" class="package" transform="translate( 189.29999999999998 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="68.7" height="97.2" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="53.1" x="42.15" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="35.4" x="33.3" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
      <g transform="translate(0 3.2)">
       <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2072,14 +2067,9 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Command Handler</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="phonesrv_info" transform="translate(53.099999999999994 0)" class="collection placeholder">
-       <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">Telephony &amp; SIM Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="messagingmw" class="package" transform="translate( 260.1 0)">
+    <g id="messagingmw" class="package" transform="translate( 242.39999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Messaging Middleware</text>
@@ -2111,7 +2101,7 @@
       </g>
      </g>
     </g>
-    <g id="imsrv" class="package" transform="translate( 313.20000000000005 0)">
+    <g id="imsrv" class="package" transform="translate( 295.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
@@ -2138,7 +2128,7 @@
       </g>
      </g>
     </g>
-    <g id="legacypresence" class="package" transform="translate( 348.6 0)">
+    <g id="legacypresence" class="package" transform="translate( 330.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Legacy Presence Services</text>
@@ -2190,7 +2180,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 419.40000000000003 0)">
+    <g id="opensrv" class="package" transform="translate( 401.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
@@ -2222,7 +2212,7 @@
       </g>
      </g>
     </g>
-    <g id="remotemgmt" class="package" transform="translate( 454.8 0)">
+    <g id="remotemgmt" class="package" transform="translate( 437.09999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Remote Management</text>
@@ -2360,7 +2350,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 525.6 0)">
+    <g id="dlnasrv" class="package" transform="translate( 507.9 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="86.4" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="86.4" x="43.2" y="86.2" dy="0.375em">DLNA Services</text>
@@ -2513,7 +2503,7 @@
       </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 614.1 0)">
+    <g id="imghandling" class="package" transform="translate( 596.4 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="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
@@ -2535,7 +2525,7 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 644.1 0)">
+    <g id="metadatasrv" class="package" transform="translate( 626.4 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Legacy Metadata Services</text>
@@ -2557,7 +2547,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 679.5 0)">
+    <g id="mds" class="package" transform="translate( 661.8 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="68.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Metadata Services</text>
@@ -2609,7 +2599,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 750.3 0)">
+    <g id="mmuifw" class="package" transform="translate( 732.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="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="86.2" dy="0.375em">Multimedia UI Fmwk.</text>
@@ -2651,7 +2641,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 803.4 0)">
+    <g id="videoutils" class="package" transform="translate( 785.6999999999999 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Video Utils</text>
@@ -2722,7 +2712,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 838.8 0)">
+    <g id="camerasrv" class="package" transform="translate( 821.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="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Camera Services</text>
@@ -2754,7 +2744,7 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 891.9 0)">
+    <g id="mmappfw" class="package" transform="translate( 874.1999999999999 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Multimedia App Fmwk.</text>
@@ -3067,7 +3057,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 927.3 0)">
+    <g id="homescreensrv" class="package" transform="translate( 909.5999999999999 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="51" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Home Screen Services</text>
@@ -3166,7 +3156,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 980.4 0)">
+    <g id="serviceapifw" class="package" transform="translate( 962.6999999999999 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="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Service API Framework</text>
@@ -3193,7 +3183,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 1015.8 0)">
+    <g id="serviceapi" class="package" transform="translate( 998.0999999999999 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="27.900000000000002" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Service API</text>
@@ -3205,7 +3195,7 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 1045.8 0)">
+    <g id="web" class="package" transform="translate( 1028.1 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="68.7" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Web</text>
@@ -3281,7 +3271,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 1116.6 0)">
+    <g id="uitools" class="package" transform="translate( 1098.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="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -3345,7 +3335,7 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="1343.0999999999997" height="174.86"/>
+   <rect x="0" class="layer" y="-3.2" width="1348.4999999999998" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -3630,10 +3620,15 @@
     </g>
     <g id="printing" class="package" transform="translate( 247.8 85.83000000000001)">
      <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="82.63000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
+     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Printing</text>
      <g transform="translate(0 3.2)">
-      <g id="imageprint" transform="translate(0 0)" class="collection">
+      <g id="DirectPrint" 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">DirectPrint</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="imageprint" transform="translate(17.7 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">ImagePrint</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3679,7 +3674,7 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 277.80000000000007 0)">
+    <g id="contacts" class="package" transform="translate( 283.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="86.4" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="86.4" x="43.2" y="167.46">Contacts Apps</text>
@@ -3741,7 +3736,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 366.30000000000007 0)">
+    <g id="organizer" class="package" transform="translate( 371.70000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="104.1" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="104.1" x="52.05" y="167.46">Organizer App Suite</text>
@@ -3823,7 +3818,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 472.50000000000006 0)">
+    <g id="messaging" class="package" transform="translate( 477.90000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Messaging Apps</text>
@@ -3865,7 +3860,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 543.3000000000001 0)">
+    <g id="commonemail" class="package" transform="translate( 548.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Email Apps</text>
@@ -3912,7 +3907,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 614.1 0)">
+    <g id="conversations" class="package" transform="translate( 619.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="68.7" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="81.63000000000001">Conversation Apps</text>
@@ -3964,7 +3959,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 684.9 0)">
+    <g id="im" class="package" transform="translate( 690.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
@@ -3981,7 +3976,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 614.1 85.83000000000001)">
+    <g id="dictionary" class="package" transform="translate( 619.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictionary</text>
@@ -3998,7 +3993,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 714.9 0)">
+    <g id="camera" class="package" transform="translate( 720.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Camera Apps</text>
@@ -4020,7 +4015,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 768 0)">
+    <g id="imgeditor" class="package" transform="translate( 773.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Image Editor Apps</text>
@@ -4042,7 +4037,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 803.4 0)">
+    <g id="videoeditor" class="package" transform="translate( 808.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Editor Apps</text>
@@ -4064,7 +4059,7 @@
       </g>
      </g>
     </g>
-    <g id="videoplayer" class="package" transform="translate( 838.8 0)">
+    <g id="videoplayer" class="package" transform="translate( 844.1999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Player Apps</text>
@@ -4106,7 +4101,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 874.1999999999999 0)">
+    <g id="photos" class="package" transform="translate( 879.5999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Photos</text>
@@ -4123,7 +4118,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 909.5999999999999 0)">
+    <g id="musicplayer" class="package" transform="translate( 914.9999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Music Player Apps</text>
@@ -4155,7 +4150,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 962.6999999999999 0)">
+    <g id="radio" class="package" transform="translate( 968.0999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Radio Apps</text>
@@ -4167,19 +4162,19 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 992.6999999999999 0)">
+    <g id="internetradio" class="package placeholder" transform="translate( 998.0999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 649.5 85.83000000000001)">
+    <g id="tv" class="package placeholder" transform="translate( 654.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 1072.7999999999997 0)">
+    <g id="voicerec" class="package" transform="translate( 1078.1999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
@@ -4201,7 +4196,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1125.8999999999996 0)">
+    <g id="screensaver" class="package" transform="translate( 1131.2999999999997 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="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -4218,7 +4213,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1155.8999999999996 0)">
+    <g id="homescreen" class="package" transform="translate( 1161.2999999999997 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="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
@@ -4245,7 +4240,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 729.6 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 735 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Graphics UIs</text>
@@ -4262,7 +4257,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 1191.2999999999997 0)">
+    <g id="profile" class="package" transform="translate( 1196.6999999999998 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="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -4284,7 +4279,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 765 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 770.4 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Speech Recognition UIs</text>
@@ -4311,7 +4306,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 818.1 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 823.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Home Screen Tools</text>
@@ -4333,7 +4328,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 871.2 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 876.6 85.83000000000001)">
      <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="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Web UIs</text>
@@ -4355,7 +4350,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 906.6 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 912 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -4377,7 +4372,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 936.6 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 942 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connectivity Tools</text>
@@ -4394,7 +4389,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 966.6 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 972 85.83000000000001)">
      <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="82.63000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">R&amp;D tools</text>
@@ -4446,7 +4441,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 1244.3999999999996 0)">
+    <g id="helps" class="package" transform="translate( 1249.7999999999997 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="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -4468,7 +4463,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 1274.3999999999996 0)">
+    <g id="techview" class="package" transform="translate( 1279.7999999999997 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="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -4563,7 +4558,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1066.5794999999998 641.7200000000001) translate(295.7205 0) scale(3.6853718291427207) translate(-295.7205)">
+ <g id="legend-root" class="legend" transform="translate(1071.9795 641.7200000000001) translate(295.7205 0) scale(3.6999802178070165) translate(-295.7205)">
   <text text-anchor="middle" class="title" x="279.38525000000004" y="0">
    <tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
    <tspan dy="1em" x="279.38525000000004">System Model</tspan>
@@ -4632,7 +4627,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">668 Collections</tspan>
+     <tspan dy="1em" x="243.275">667 Collections</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/sf3lit.svg	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Fri Apr 30 14:54:26 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 872.6714176753632" 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 4911.8 873.0221753722548" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -426,8 +426,8 @@
  <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)">
-   <rect x="-536.2500000000007" class="layer" y="-3.2" width="4880.1" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(558.9500000000007 3.2)">
+   <rect x="-546.1500000000008" class="layer" y="-3.2" width="4889.400000000001" 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"/>
@@ -2085,21 +2085,10 @@
     </g>
     <g id="security" class="package" transform="translate( 1744.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="74.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="74.7" x="37.35" y="119.23000000000002">OS Security</text>
-     <g transform="translate(0 3.2)">
-      <g id="authenticationservices" 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">Authentication Services</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="authenticationserver" 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; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Authentication Server</text>
-        </g>
-       </g>
-      </g>
-      <g id="authorisation" transform="translate(17.7 0)" class="collection">
+     <rect class="package" x="0" width="64.2" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="119.23000000000002">OS Security</text>
+     <g transform="translate(0 3.2)">
+      <g id="authorisation" transform="translate(0 0)" class="collection">
        <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">Authorisation</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2115,7 +2104,7 @@
         </g>
        </g>
       </g>
-      <g id="contentmgmt" transform="translate(38.400000000000006 0)" class="collection">
+      <g id="contentmgmt" transform="translate(20.700000000000003 0)" class="collection">
        <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">Content Management</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2227,7 +2216,7 @@
         </g>
        </g>
       </g>
-      <g id="security_info" transform="translate(59.10000000000001 0)" class="collection">
+      <g id="security_info" transform="translate(41.400000000000006 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">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2241,7 +2230,7 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 1820.9999999999993 0)">
+    <g id="lbs" class="package" transform="translate( 1810.4999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="55.8" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="119.23000000000002">Locating Services</text>
@@ -2383,7 +2372,7 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 1878.8999999999994 0)">
+    <g id="commsfw" class="package" transform="translate( 1868.3999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="57.00000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="119.23000000000002">Comms Framework</text>
@@ -2535,7 +2524,7 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 1937.9999999999993 0)">
+    <g id="networkingsrv" class="package" transform="translate( 1927.4999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="170.70000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">Networking Services</text>
@@ -2795,7 +2784,7 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 2110.7999999999993 0)">
+    <g id="wlan" class="package" transform="translate( 2100.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="174.89999999999998" height="120.23000000000002" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" y="119.23000000000002">WLAN</text>
@@ -2942,7 +2931,7 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 2287.7999999999993 0)">
+    <g id="cellularsrv" class="package" transform="translate( 2277.2999999999993 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="101.39999999999998" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="119.23000000000002">Cellular Baseband Services</text>
@@ -3179,7 +3168,7 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 2391.2999999999993 0)">
+    <g id="bt" class="package" transform="translate( 2380.7999999999993 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="65.1" height="120.23000000000002" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">Bluetooth</text>
@@ -3335,7 +3324,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 2458.499999999999 0)">
+    <g id="usb" class="package" transform="translate( 2447.999999999999 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>
@@ -3371,7 +3360,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 2488.499999999999 0)">
+    <g id="mm" class="package" transform="translate( 2477.999999999999 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="778.1999999999996" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="778.1999999999996" x="389.0999999999998" y="119.23000000000002">Multimedia</text>
@@ -4099,7 +4088,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 3268.799999999999 0)">
+    <g id="imagingext" class="package" transform="translate( 3258.299999999999 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="91.19999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="119.23000000000002">Imaging Extensions</text>
@@ -4180,7 +4169,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3362.099999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3351.599999999999 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="95.4" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="95.4" x="47.7" y="119.23000000000002">Graphics</text>
@@ -4471,7 +4460,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3459.599999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3449.099999999999 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="84.9" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84.9" x="42.45" y="119.23000000000002">Text &amp; Localisation Services</text>
@@ -4621,7 +4610,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3546.599999999999 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3536.099999999999 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="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -4712,7 +4701,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3613.799999999999 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3603.299999999999 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">Device Platform Release</text>
@@ -4817,7 +4806,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3666.8999999999987 0)">
+    <g id="osrndtools" class="package" transform="translate( 3656.3999999999987 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="140.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="140.7" x="70.35" y="119.23000000000002">OS R&amp;D tools</text>
@@ -5014,7 +5003,7 @@
   <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)">
-   <rect x="0" class="layer" y="-3.2" width="4880.1" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="4889.400000000001" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -5796,12 +5785,12 @@
     </g>
     <g id="drm" class="package" transform="translate( 612.3000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="160.2" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="160.2" x="80.1" y="115.00000000000003">DRM</text>
+     <rect class="package" x="0" width="169.5" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="169.5" x="84.75" y="115.00000000000003">DRM</text>
      <g transform="translate(0 3.2)">
       <g id="drm_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">DRM Platform Interfaces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="138.1" height="6.299999999999999">DRM Platform Interfaces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="roap_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -5863,19 +5852,24 @@
          <use width="9.3" height="9.3" x="102.29999999999998" 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="106.94999999999999">WMDRM Access API</text>
         </g>
-        <g id="camese_utility_api" class="component">
+        <g id="wmdrm_ota_access_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="111.59999999999998" 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="116.24999999999999">Camese Utility API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">WMDRM OTA Access API</text>
+        </g>
+        <g id="camese_utility_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="120.89999999999998" 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="125.54999999999998">Camese Utility API</text>
         </g>
         <g id="camese_framework_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="120.89999999999998" 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="125.54999999999998">Camese Framework API</text>
-        </g>
-       </g>
-      </g>
-      <g id="drm_pub" transform="translate(132.29999999999998 0)" class="collection">
+         <use width="9.3" height="9.3" x="130.2" 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="134.85">Camese Framework API</text>
+        </g>
+       </g>
+      </g>
+      <g id="drm_pub" transform="translate(141.6 0)" 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">DRM Public Interfaces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6235,7 +6229,7 @@
       </g>
      </g>
     </g>
-    <g id="accesssec" class="package" transform="translate( 774.6000000000003 100.4)">
+    <g id="accesssec" class="package" transform="translate( 783.9000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="178.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="115.00000000000003">Access Security</text>
@@ -6360,7 +6354,7 @@
       </g>
      </g>
     </g>
-    <g id="ipconnmgmt" class="package" transform="translate( 955.5000000000002 100.4)">
+    <g id="ipconnmgmt" class="package" transform="translate( 964.8000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="235.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="235.79999999999998" x="117.89999999999999" y="115.00000000000003">IP Connectivity Mgmt.</text>
@@ -6617,7 +6611,7 @@
       </g>
      </g>
     </g>
-    <g id="netprotocols" class="package" transform="translate( 1193.4 100.4)">
+    <g id="netprotocols" class="package" transform="translate( 1202.7000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">High-level Internet Protocols</text>
@@ -6776,7 +6770,7 @@
       </g>
      </g>
     </g>
-    <g id="ipappprotocols" class="package" transform="translate( 1279.2 100.4)">
+    <g id="ipappprotocols" class="package" transform="translate( 1288.5000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">IP App Protocols</text>
@@ -8482,7 +8476,7 @@
       </g>
      </g>
     </g>
-    <g id="remotestorage" class="package" transform="translate( 1327.8 100.4)">
+    <g id="remotestorage" class="package" transform="translate( 1337.1000000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">Remote Storage</text>
@@ -8536,7 +8530,7 @@
       </g>
      </g>
     </g>
-    <g id="remoteconn" class="package" transform="translate( 1385.7 100.4)">
+    <g id="remoteconn" class="package" transform="translate( 1395.0000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="48.6" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="48.6" x="24.3" y="115.00000000000003">Remote Connectivity</text>
@@ -8652,7 +8646,7 @@
       </g>
      </g>
     </g>
-    <g id="srvdiscovery" class="package" transform="translate( 1436.4 100.4)">
+    <g id="srvdiscovery" class="package" transform="translate( 1445.7000000000003 100.4)">
      <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="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Service Discovery &amp; Usage</text>
@@ -8893,7 +8887,7 @@
       </g>
      </g>
     </g>
-    <g id="btservices" class="package" transform="translate( 1466.4 100.4)">
+    <g id="btservices" class="package" transform="translate( 1475.7000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="176.99999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="176.99999999999997" x="88.49999999999999" y="115.00000000000003">Bluetooth Services</text>
@@ -9087,7 +9081,7 @@
       </g>
      </g>
     </g>
-    <g id="usbservices" class="package" transform="translate( 1645.5 100.4)">
+    <g id="usbservices" class="package" transform="translate( 1654.8000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="92.99999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="92.99999999999999" x="46.49999999999999" y="115.00000000000003">USB Services</text>
@@ -9238,7 +9232,7 @@
       </g>
      </g>
     </g>
-    <g id="shortlinkconn" class="package" transform="translate( 1740.6 100.4)">
+    <g id="shortlinkconn" class="package" transform="translate( 1749.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="74.39999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="74.39999999999999" x="37.199999999999996" y="115.00000000000003">Shortlink Connectivity</text>
@@ -9803,7 +9797,7 @@
       </g>
      </g>
     </g>
-    <g id="mmmw" class="package" transform="translate( 1817.1 100.4)">
+    <g id="mmmw" class="package" transform="translate( 1826.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="308.1000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="308.1000000000001" x="154.05000000000004" y="115.00000000000003">Multimedia Middleware</text>
@@ -10030,7 +10024,7 @@
       </g>
      </g>
     </g>
-    <g id="helix" class="package" transform="translate( 2127.3 100.4)">
+    <g id="helix" class="package" transform="translate( 2136.6000000000004 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
@@ -10319,7 +10313,7 @@
       </g>
      </g>
     </g>
-    <g id="inputmethods" class="package" transform="translate( 2157.3 100.4)">
+    <g id="inputmethods" class="package" transform="translate( 2166.6000000000004 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="176.70000000000005" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="176.70000000000005" x="88.35000000000002" y="115.00000000000003">Input Methods</text>
@@ -10527,7 +10521,7 @@
       </g>
      </g>
     </g>
-    <g id="qt" class="package" transform="translate( 2336.1000000000004 100.4)">
+    <g id="qt" class="package" transform="translate( 2345.4000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="89.4" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="89.4" x="44.7" y="115.00000000000003">Qt</text>
@@ -10576,7 +10570,7 @@
       </g>
      </g>
     </g>
-    <g id="classicui" class="package" transform="translate( 2427.6000000000004 100.4)">
+    <g id="classicui" class="package" transform="translate( 2436.9000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="1511.0999999999988" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="1511.0999999999988" x="755.5499999999994" y="115.00000000000003">Classic UI</text>
@@ -11544,7 +11538,7 @@
       </g>
      </g>
     </g>
-    <g id="svgt" class="package" transform="translate( 3940.799999999999 100.4)">
+    <g id="svgt" class="package" transform="translate( 3950.099999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
@@ -11578,7 +11572,7 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 3970.799999999999 100.4)">
+    <g id="uiaccelerator" class="package" transform="translate( 3980.099999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">UI Accelerator</text>
@@ -11632,7 +11626,7 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 4028.699999999999 100.4)">
+    <g id="uiresources" class="package" transform="translate( 4037.999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="262.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="262.8" x="131.4" y="105" dy="0.375em">UI Resources</text>
@@ -11878,7 +11872,7 @@
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 4293.5999999999995 100.4)">
+    <g id="hapticsservices" class="package" transform="translate( 4302.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">Haptics Services</text>
@@ -11953,7 +11947,7 @@
       </g>
      </g>
     </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 4342.2 100.4)">
+    <g id="gsprofilesrv" class="package" transform="translate( 4351.5 100.4)">
      <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.39999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="104.39999999999998" x="52.19999999999999" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
@@ -12265,7 +12259,7 @@
       </g>
      </g>
     </g>
-    <g id="appinstall" class="package" transform="translate( 4448.7 100.4)">
+    <g id="appinstall" class="package" transform="translate( 4458 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="157.49999999999997" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="157.49999999999997" x="78.74999999999999" y="115.00000000000003">App Installation</text>
@@ -12933,7 +12927,7 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 4608.3 100.4)">
+    <g id="websrv" class="package" transform="translate( 4617.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="241.80000000000013" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="241.80000000000013" x="120.90000000000006" y="115.00000000000003">Web Services</text>
@@ -13117,7 +13111,7 @@
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 4852.200000000001 100.4)">
+    <g id="platformtools" class="package" transform="translate( 4861.500000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
@@ -13238,8 +13232,8 @@
  <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)">
-   <rect x="-823.9499999999991" class="layer" y="-3.2" width="4880.1" height="189.43"/>
+  <g class="layer-detail" transform="translate(839.8999999999992 3.2)">
+   <rect x="-827.0999999999992" class="layer" y="-3.2" width="4889.400000000001" height="189.43"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -14315,10 +14309,31 @@
     </g>
     <g id="printing" class="package" transform="translate( 548.7 100.4)">
      <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="82.63000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageprint" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="57.900000000000006" height="82.63000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="81.63000000000002">Printing</text>
+     <g transform="translate(0 3.2)">
+      <g id="DirectPrint" transform="translate(0 0)" 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">DirectPrint</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="DirectPrintApp" 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; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DirectPrint App</text>
+        </g>
+        <g id="DirectPrintServer" 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">DirectPrint Server</text>
+        </g>
+        <g id="DirectPrintClient" 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">DirectPrint Client</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageprint" transform="translate(30.000000000000004 0)" 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">ImagePrint</text>
        <g transform="translate(0 6.299999999999999)">
@@ -14439,7 +14454,7 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 605.6999999999999 0)">
+    <g id="contacts" class="package" transform="translate( 608.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="569.7000000000004" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="182.03">Contacts Apps</text>
@@ -14866,7 +14881,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 1177.5000000000002 0)">
+    <g id="organizer" class="package" transform="translate( 1180.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="289.80000000000007" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="182.03">Organizer App Suite</text>
@@ -15282,7 +15297,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 1469.4000000000003 0)">
+    <g id="messaging" class="package" transform="translate( 1472.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="356.7000000000001" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="182.03">Messaging Apps</text>
@@ -15627,7 +15642,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 1828.2000000000005 0)">
+    <g id="commonemail" class="package" transform="translate( 1831.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="148.8" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="148.8" x="74.4" y="182.03">Email Apps</text>
@@ -15851,7 +15866,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 1979.1000000000006 0)">
+    <g id="conversations" class="package" transform="translate( 1982.1000000000008 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="106.50000000000001" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="106.50000000000001" x="53.25000000000001" y="96.2">Conversation Apps</text>
@@ -15977,7 +15992,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 2087.7000000000007 0)">
+    <g id="im" class="package" transform="translate( 2090.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Instant Msg. Apps</text>
@@ -16000,7 +16015,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 1979.1000000000006 100.4)">
+    <g id="dictionary" class="package" transform="translate( 1982.1000000000008 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictionary</text>
@@ -16023,7 +16038,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 2117.7000000000007 0)">
+    <g id="camera" class="package" transform="translate( 2120.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Camera Apps</text>
@@ -16062,7 +16077,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 2159.100000000001 0)">
+    <g id="imgeditor" class="package" transform="translate( 2162.100000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Image Editor Apps</text>
@@ -16167,7 +16182,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 2274.900000000001 0)">
+    <g id="videoeditor" class="package" transform="translate( 2277.900000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="64.2" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="64.2" x="32.1" y="96.2">Video Editor Apps</text>
@@ -16252,7 +16267,7 @@
       </g>
      </g>
     </g>
-    <g id="videoplayer" class="package" transform="translate( 2341.200000000001 0)">
+    <g id="videoplayer" class="package" transform="translate( 2344.200000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="178.8" x="117.30000000000001" y="11" dy="0.375em">Video Player Apps</text>
@@ -16502,7 +16517,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 2550.0000000000014 0)">
+    <g id="photos" class="package" transform="translate( 2553.0000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="160.19999999999996" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="160.19999999999996" x="80.09999999999998" y="96.2">Photos</text>
@@ -16606,7 +16621,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 2712.3000000000015 0)">
+    <g id="musicplayer" class="package" transform="translate( 2715.3000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="132.29999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="132.29999999999998" x="66.14999999999999" y="96.2">Music Player Apps</text>
@@ -16716,7 +16731,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 2846.7000000000016 0)">
+    <g id="radio" class="package" transform="translate( 2849.7000000000016 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="55.8" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="96.2">Radio Apps</text>
@@ -16759,7 +16774,7 @@
       </g>
      </g>
     </g>
-    <g id="voicerec" class="package" transform="translate( 2904.6000000000017 0)">
+    <g id="voicerec" class="package" transform="translate( 2907.6000000000017 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
@@ -16787,13 +16802,13 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package placeholder" transform="translate( 2943.000000000002 0)">
+    <g id="screensaver" class="package placeholder" transform="translate( 2946.000000000002 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="78" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3023.1000000000017 0)">
+    <g id="homescreen" class="package" transform="translate( 3026.1000000000017 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="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
@@ -16909,7 +16924,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 2014.5000000000007 100.4)">
+    <g id="graphicsuis" class="package" transform="translate( 2017.500000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
@@ -16948,7 +16963,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3138.900000000002 0)">
+    <g id="profile" class="package" transform="translate( 3141.900000000002 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="33.3" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
@@ -16982,7 +16997,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 2062.2000000000007 100.4)">
+    <g id="speechsrv" class="package" transform="translate( 2065.2000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="290.40000000000015" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="81.63000000000002">Speech Recognition UIs</text>
@@ -17262,7 +17277,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 2354.7000000000007 100.4)">
+    <g id="homescreentools" class="package" transform="translate( 2357.7000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
@@ -17295,7 +17310,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 2410.8000000000006 100.4)">
+    <g id="webuis" class="package" transform="translate( 2413.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000002">Web UIs</text>
@@ -17350,7 +17365,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 2449.2000000000007 100.4)">
+    <g id="jrt" class="package" transform="translate( 2452.2000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -17378,7 +17393,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 2479.2000000000007 100.4)">
+    <g id="conntools" class="package" transform="translate( 2482.2000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connectivity Tools</text>
@@ -17402,7 +17417,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 2509.2000000000007 100.4)">
+    <g id="rndtools" class="package" transform="translate( 2512.2000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="84.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="84.9" x="42.45" y="81.63000000000002">R&amp;D tools</text>
@@ -17497,7 +17512,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 3174.300000000002 0)">
+    <g id="helps" class="package" transform="translate( 3177.300000000002 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="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
@@ -17532,7 +17547,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3204.300000000002 0)">
+    <g id="techview" class="package" transform="translate( 3207.300000000002 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="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
@@ -17575,8 +17590,8 @@
  <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 class="layer-detail" transform="translate(2418.5000000000005 3.2)">
+   <rect x="-2405.7000000000003" class="layer" y="-3.2" width="4889.400000000001" 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;"/>
@@ -17586,7 +17601,7 @@
    </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)">
+ <g id="legend-root" class="legend" transform="translate(4605.279500000001 681.49) translate(303.3205 0) scale(12.946305970087748) 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>
@@ -17712,7 +17727,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <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>
+     <tspan dy="1em" x="250.875">2542 Components</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/system_model.xml	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Apr 30 14:54:26 2010 +0100
@@ -1141,11 +1141,6 @@
 </collection>
 </block>
 <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="authenticationserver" long-name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="os/security/authenticationservices/authenticationserver/group" mrp="os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
 <collection name="authorisation" long-name="Authorisation" level="utilities">
 <component name="userpromptservice" long-name="User Prompt Service" introduced="^3" purpose="mandatory">
 <unit bldFile="os/security/authorisation/userpromptservice/group" mrp="os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
@@ -3304,6 +3299,9 @@
 <component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
 <unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
 </component>
+<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
+<unit bldFile="mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
 <component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
 <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
 </component>
@@ -4265,7 +4263,7 @@
 <unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
 </component>
 <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
-<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+<unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
 </component>
 </collection>
 <collection name="telutils" long-name="Telephony Utils" level="generic">
@@ -4286,13 +4284,13 @@
 </collection>
 <collection name="cellular" long-name="Cellular" level="server">
 <component name="telephonysettings" filter="s60" long-name="Telephony Settings">
-<unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
 </component>
 <component name="sssettings" filter="s60" long-name="Supplementary Service Settings">
-<unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
+<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
 </component>
 <component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI">
-<unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
+<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
 </component>
 <component name="servicerequest" filter="s60" long-name="Service Request">
 <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
@@ -4303,10 +4301,10 @@
 <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
 </component>
 <component name="cce" filter="s60" long-name="CCE">
-<unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
+<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
 </component>
 <component name="spsettings" filter="s60" long-name="Service Provider Settings">
-<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
+<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
 </component>
 <component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
 <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -4334,13 +4332,13 @@
 <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
 </component>
 <component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
-<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
 </component>
 <component name="dialutils" filter="s60" long-name="Dial Utils">
-<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
+<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
 </component>
 <component name="phoneclient" filter="s60" long-name="Phone Client">
-<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
 </component>
 <component name="phoneserver" filter="s60" long-name="Phone Server">
 <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
@@ -4367,7 +4365,6 @@
 <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
 </component>
 </collection>
-<collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
 </block>
 <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
 <collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
@@ -8645,6 +8642,17 @@
 </collection>
 </block>
 <block name="printing" level="services" long-name="Printing" levels="app">
+<collection name="DirectPrint" level="app">
+<component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component name="DirectPrintServer" filter="sf_build" long-name="DirectPrint Server" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component name="DirectPrintClient" filter="sf_build" long-name="DirectPrint Client" introduced="^3">
+<unit bldFile="app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
 <collection name="imageprint" long-name="ImagePrint" level="app">
 <component name="clog" filter="s60" long-name="ImagePrint Logging" introduced="^2">
 <unit bldFile="app/printing/imageprint/clog/group"/>

--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 30 13:36:13 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 30 14:54:26 2010 +0100
@@ -1078,11 +1078,6 @@
 </collection>
 </package>
 <package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
-<collection id="authenticationservices" name="Authentication Services" level="utilities">
-<component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
-<unit bldFile="/os/security/authenticationservices/authenticationserver/group" mrp="/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
-</component>
-</collection>
 <collection id="authorisation" name="Authorisation" level="utilities">
 <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
@@ -3308,6 +3303,9 @@
 <component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
 <unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
 </component>
+<component id="wmdrm_ota_access_api" name="WMDRM OTA Access API" class="api" filter="s60">
+<unit bldFile="/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
 <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
 <meta rel="config">
 <defined condition="__WINDOWS_MEDIA_DRM"/>
@@ -4289,7 +4287,8 @@
 
 </component>
 <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
-<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group" filter="!test"/>
+
 </component>
 </collection>
 <collection id="telutils" name="Telephony Utils" level="generic">
@@ -4310,28 +4309,32 @@
 </collection>
 <collection id="cellular" name="Cellular" level="server">
 <component id="telephonysettings" filter="s60" name="Telephony Settings">
-<unit bldFile="/mw/phonesrv/cellular/telephonysettings/group"/>
+<unit bldFile="/mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+
 </component>
 <component id="sssettings" filter="s60" name="Supplementary Service Settings">
-<unit bldFile="/mw/phonesrv/cellular/sssettings/group"/>
+<unit bldFile="/mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+
 </component>
 <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
-<unit bldFile="/mw/phonesrv/cellular/psetnotesui/group"/>
+<unit bldFile="/mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+
 </component>
 <component id="servicerequest" filter="s60" name="Service Request">
 <unit bldFile="/mw/phonesrv/cellular/servicerequest/group"/>
 </component>
-
 </collection>
 <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
 <component id="callprovider" filter="s60" name="Call Provider">
 <unit bldFile="/mw/phonesrv/convergedcallengine/callprovider/group"/>
 </component>
 <component id="cce" filter="s60" name="CCE">
-<unit bldFile="/mw/phonesrv/convergedcallengine/cce/group"/>
+<unit bldFile="/mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+
 </component>
 <component id="spsettings" filter="s60" name="Service Provider Settings">
-<unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group"/>
+<unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+
 </component>
 <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
 <unit bldFile="/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -4343,7 +4346,6 @@
 <!--  should spell out CS in name -->
 <unit bldFile="/mw/phonesrv/convergedcallengine/csplugin/group"/>
 </component>
-
 </collection>
 <collection id="engines" name="Telephony Engines" level="specific">
 <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
@@ -4360,13 +4362,16 @@
 <unit bldFile="/mw/phonesrv/phoneclientserver/enpolicy/group"/>
 </component>
 <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
-<unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+
 </component>
 <component id="dialutils" filter="s60" name="Dial Utils">
-<unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+
 </component>
 <component id="phoneclient" filter="s60" name="Phone Client">
-<unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group"/>
+<unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+
 </component>
 <component id="phoneserver" filter="s60" name="Phone Server">
 <unit bldFile="/mw/phonesrv/phoneclientserver/phoneserver/group"/>
@@ -4374,7 +4379,6 @@
 <component id="callui" filter="s60" name="Call UI">
 <unit bldFile="/mw/phonesrv/phoneclientserver/callui/group"/>
 </component>
-
 </collection>
 <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
 <component id="satserver" filter="s60" name="SAT Server">
@@ -4394,9 +4398,6 @@
 <unit bldFile="/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
 </component>
 </collection>
-<collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
-
-</collection>
 </package>
 <package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack fw api">
 <collection id="msgfw_pub" name="Messaging Middleware Public Interfaces" level="api">
@@ -8974,6 +8975,17 @@
 </collection>
 </package>
 <package id="printing" level="services" tech-domain="de" name="Printing" levels="app">
+<collection id="DirectPrint" name="DirectPrint" level="app">
+<component id="DirectPrintApp" filter="sf_build" name="DirectPrint App" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintApp/group"/>
+</component>
+<component id="DirectPrintServer" filter="sf_build" name="DirectPrint Server" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintServer/group"/>
+</component>
+<component id="DirectPrintClient" filter="sf_build" name="DirectPrint Client" introduced="^3">
+<unit bldFile="/app/printing/DirectPrint/DirectPrintClient/group"/>
+</component>
+</collection>
 <collection id="imageprint" name="ImagePrint" level="app">
 <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
 <unit bldFile="/app/printing/imageprint/clog/group"/>

author	William Roberts <williamr@symbian.org>
	Fri, 30 Apr 2010 14:54:26 +0100
changeset 511	41bfba117374
parent 510	478da3b588e5
child 512	584193b539f4

symbian3/single/sysdefs/full_system_model_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/single/sysdefs/sf3.svg		file \| annotate \| diff \| comparison \| revisions
symbian3/single/sysdefs/sf3c.svg		file \| annotate \| diff \| comparison \| revisions
symbian3/single/sysdefs/sf3lit.svg		file \| annotate \| diff \| comparison \| revisions
symbian3/single/sysdefs/system_model.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/single/sysdefs/system_model_3.0.xml		file \| annotate \| diff \| comparison \| revisions