--- a/symbian3/single/sysdefs/full_system_model_3.0.xml Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml Wed Jun 09 12:29:36 2010 +0100
@@ -1493,10 +1493,10 @@
<component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
<unit mrp="/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
</component>
-<component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+<component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development" filter="test">
<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
</component>
-<component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+<component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development" filter="test">
<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
</component>
</collection>
@@ -1680,7 +1680,7 @@
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin" filter="test">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
</component>
<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
@@ -11135,9 +11135,9 @@
<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection id="java_stubs" name="Java Stubs" level="util">
-<component id="java_stubs_build" filter="s60" name="JRT Stubs Build">
-<unit bldFile="/app/jrt/java_stubs/group"/>
+<collection id="java_build" name="JRT Build" level="util">
+<component id="java_build_sf" filter="sf_build" name="JRT Build for Symbian Foundation">
+<unit bldFile="/app/jrt/group/sf"/>
</component>
</collection>
</package>
--- a/symbian3/single/sysdefs/sf3.svg Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg Wed Jun 09 12:29:36 2010 +0100
@@ -2974,8 +2974,8 @@
</g>
</g>
<g id="networkingtestandutils" transform="translate(17.7 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">Networking Test & Utils</text>
+ <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">Networking Test & Utils</text>
<g transform="translate(0 6.299999999999999)">
<g id="networkingexamples" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2983,21 +2983,9 @@
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Networking Examples</text>
</g>
- <g id="networkingintegrationtest" 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; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Networking Integ Test</text>
- </g>
- <g id="networkingperformancemeasurementtools" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Networking Performance Measurement Tools</text>
- </g>
- </g>
- </g>
- <g id="networkingsrv_info" transform="translate(47.7 0)" class="collection">
+ </g>
+ </g>
+ <g id="networkingsrv_info" transform="translate(35.4 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">Networking Services Info</text>
<g transform="translate(0 6.299999999999999)">
@@ -3312,8 +3300,8 @@
</g>
</g>
<g id="telephonyserverplugins" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Telephony Server Plugins</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Telephony Server Plugins</text>
<g transform="translate(0 6.299999999999999)">
<g id="common_tsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -3332,21 +3320,15 @@
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Multimode TSY</text>
</g>
- <g id="simtsy" class="component">
+ <g id="ctsydispatchlayer" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SIM TSY</text>
- </g>
- <g id="ctsydispatchlayer" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">C-TSY Dispatch Layer</text>
+ </g>
+ <g id="simatktsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">C-TSY Dispatch Layer</text>
- </g>
- <g id="simatktsy" 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="46.5" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SIMATK TSY</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">SIMATK TSY</text>
</g>
</g>
</g>
@@ -19448,14 +19430,14 @@
</g>
</g>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" 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">Java Stubs</text>
- <g transform="translate(0 6.299999999999999)">
- <g id="java_stubs_build" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
- <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JRT Stubs Build</text>
+ <g id="java_build" transform="translate(0 56.400000000000006)" 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">JRT Build</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="java_build_sf" 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">JRT Build for Symbian Foundation</text>
</g>
</g>
</g>
@@ -19901,7 +19883,7 @@
<g id="s4-overlay0" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Component (167)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Component (164)</text>
</g>
</g>
</g>
@@ -19936,7 +19918,7 @@
<text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
<tspan dy="-1em" x="265.17499999999995">107 Packages</tspan>
<tspan dy="1em" x="265.17499999999995">658 Collections</tspan>
- <tspan dy="1em" x="265.17499999999995">2882 Components</tspan>
+ <tspan dy="1em" x="265.17499999999995">2879 Components</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/sf3c.svg Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg Wed Jun 09 12:29:36 2010 +0100
@@ -4301,9 +4301,9 @@
<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Platform Interfaces</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
- <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
+ <g id="java_build" transform="translate(0 56.400000000000006)" class="collection">
+ <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+ <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Build</text>
<g transform="translate(0 6.299999999999999)"/>
</g>
</g>
--- a/symbian3/single/sysdefs/sf3lit.svg Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg Wed Jun 09 12:29:36 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 4894.1 872.3546042717193" 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 4894.1 891.1546042717192" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
<title>Symbian OS ^3 System Model: date</title>
<defs>
<style type="text/css">
@@ -423,7 +423,7 @@
]]><![CDATA[
}
]]></script>
- <g id="os" transform="translate(3.1999999999999993 443.83000000000004)" class="layer">
+ <g id="os" transform="translate(3.1999999999999993 462.63)" 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(541.2500000000009 3.2)">
@@ -2741,8 +2741,8 @@
</g>
</g>
<g id="networkingtestandutils" transform="translate(17.7 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">Networking Test & Utils</text>
+ <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">Networking Test & Utils</text>
<g transform="translate(0 6.299999999999999)">
<g id="networkingexamples" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2750,21 +2750,9 @@
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Networking Examples</text>
</g>
- <g id="networkingintegrationtest" 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; "/>
- <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Networking Integ Test</text>
- </g>
- <g id="networkingperformancemeasurementtools" class="component">
- <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
- <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Networking Performance Measurement Tools</text>
- </g>
- </g>
- </g>
- <g id="networkingsrv_info" transform="translate(47.7 0)" class="collection">
+ </g>
+ </g>
+ <g id="networkingsrv_info" transform="translate(35.4 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">Networking Services Info</text>
<g transform="translate(0 6.299999999999999)">
@@ -3074,8 +3062,8 @@
</g>
</g>
<g id="telephonyserverplugins" transform="translate(0 56.400000000000006)" class="collection">
- <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
- <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Telephony Server Plugins</text>
+ <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+ <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Telephony Server Plugins</text>
<g transform="translate(0 6.299999999999999)">
<g id="common_tsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -3094,21 +3082,15 @@
<use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Multimode TSY</text>
</g>
- <g id="simtsy" class="component">
+ <g id="ctsydispatchlayer" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SIM TSY</text>
- </g>
- <g id="ctsydispatchlayer" class="component">
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">C-TSY Dispatch Layer</text>
+ </g>
+ <g id="simatktsy" class="component">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
<use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">C-TSY Dispatch Layer</text>
- </g>
- <g id="simatktsy" 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="46.5" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SIMATK TSY</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">SIMATK TSY</text>
</g>
</g>
</g>
@@ -5020,7 +5002,7 @@
</g>
</g>
</g>
- <g id="mw" transform="translate(3.1999999999999993 217.83)" class="layer">
+ <g id="mw" transform="translate(3.1999999999999993 236.63)" class="layer">
<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
<text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
<g class="layer-detail" transform="translate(12.8 3.2)">
@@ -13187,10 +13169,10 @@
</g>
</g>
<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>
+ <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="208.23"/>
+ <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="208.23" height="9.3" x="-104.41499999999999">Applications</text>
<g class="layer-detail" transform="translate(826.8499999999997 3.2)">
- <rect x="-814.0499999999997" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
+ <rect x="-814.0499999999997" class="layer" y="-3.2" width="4871.700000000001" height="208.23"/>
<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"/>
@@ -13325,8 +13307,8 @@
</g>
<g id="mmsharinguis" class="package" transform="translate( 0 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
- <rect class="package" x="0" width="55.8" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
- <text text-anchor="middle" class="package" width="55.8" x="27.9" y="81.63000000000002">Multimedia Sharing UIs</text>
+ <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:darkkhaki;"/>
+ <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.43">Multimedia Sharing UIs</text>
<g transform="translate(0 3.2)">
<g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -13420,8 +13402,8 @@
</g>
<g id="phone" class="package" transform="translate( 91.5 0)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
- <rect class="package" x="0" width="243.9" height="183.03" y="0" style="fill:darkkhaki;"/>
- <text text-anchor="middle" class="package" width="243.9" x="121.95" y="182.03">Phone Apps</text>
+ <rect class="package" x="0" width="243.9" height="201.82999999999998" y="0" style="fill:darkkhaki;"/>
+ <text text-anchor="middle" class="package" width="243.9" x="121.95" y="200.82999999999998">Phone Apps</text>
<g transform="translate(0 3.2)">
<g id="phone_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
@@ -13957,8 +13939,8 @@
</g>
<g id="settingsuis" class="package" transform="translate( 337.5 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="37.2" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="37.2" x="18.6" y="81.63000000000002">Settings UIs</text>
+ <rect class="package" x="0" width="37.2" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="37.2" x="18.6" y="100.43">Settings UIs</text>
<g transform="translate(0 3.2)">
<g id="devmngt_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -14017,8 +13999,8 @@
</g>
<g id="contentcontrol" class="package" transform="translate( 376.8 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
+ <rect class="package" x="0" width="67.19999999999999" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="100.43">Content Control Daemons</text>
<g transform="translate(0 3.2)">
<g id="contentctrl_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -14076,8 +14058,8 @@
</g>
<g id="devicecontrol" class="package" transform="translate( 446.1 100.4)">
<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
- <rect class="package" x="0" width="95.1" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
- <text text-anchor="middle" class="package" width="95.1" x="47.55" y="81.63000000000002">Device Control Daemons</text>
+ <rect class="package" x="0" width="95.1" height="101.43" y="0" style="fill:darkseagreen;"/>
+ <text text-anchor="middle" class="package" width="95.1" x="47.55" y="100.43">Device Control Daemons</text>
<g transform="translate(0 3.2)">
<g id="devicediagnostics" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
@@ -14234,8 +14216,8 @@
</g>
<g id="printing" class="package" transform="translate( 543.3000000000001 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="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>
+ <rect class="package" x="0" width="57.900000000000006" height="101.43" y="0" style="fill:orchid;"/>
+ <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="100.43">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"/>
@@ -14376,8 +14358,8 @@
</g>
<g id="contacts" class="package" transform="translate( 603.3000000000001 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>
+ <rect class="package" x="0" width="569.7000000000004" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="200.82999999999998">Contacts Apps</text>
<g transform="translate(0 3.2)">
<g id="contacts_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
@@ -14803,8 +14785,8 @@
</g>
<g id="organizer" class="package" transform="translate( 1175.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="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>
+ <rect class="package" x="0" width="289.80000000000007" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="200.82999999999998">Organizer App Suite</text>
<g transform="translate(0 3.2)">
<g id="organizer_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="186.00000000000006"/>
@@ -15219,8 +15201,8 @@
</g>
<g id="messaging" class="package" transform="translate( 1467.0000000000005 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>
+ <rect class="package" x="0" width="356.7000000000001" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="200.82999999999998">Messaging Apps</text>
<g transform="translate(0 3.2)">
<g id="msg_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -15564,8 +15546,8 @@
</g>
<g id="commonemail" class="package" transform="translate( 1825.8000000000006 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>
+ <rect class="package" x="0" width="148.8" height="201.82999999999998" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="148.8" x="74.4" y="200.82999999999998">Email Apps</text>
<g transform="translate(0 3.2)">
<g id="email_pub" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -15937,8 +15919,8 @@
</g>
<g id="dictionary" class="package" transform="translate( 1976.7000000000007 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>
+ <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
+ <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Dictionary</text>
<g transform="translate(0 3.2)">
<g id="dictionary_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -16767,8 +16749,8 @@
</g>
<g id="graphicsuis" class="package" transform="translate( 2012.1000000000008 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>
+ <rect class="package" x="0" width="45.6" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.43">Graphics UIs</text>
<g transform="translate(0 3.2)">
<g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -16840,8 +16822,8 @@
</g>
<g id="speechsrv" class="package" transform="translate( 2059.8000000000006 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>
+ <rect class="package" x="0" width="290.40000000000015" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="100.43">Speech Recognition UIs</text>
<g transform="translate(0 3.2)">
<g id="speechsrv_plat" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
@@ -17120,8 +17102,8 @@
</g>
<g id="homescreentools" class="package" transform="translate( 2352.3000000000006 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>
+ <rect class="package" x="0" width="54" height="101.43" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="54" x="27" y="100.43">Home Screen Tools</text>
<g transform="translate(0 3.2)">
<g id="dtdinstaller" transform="translate(0 0)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17153,8 +17135,8 @@
</g>
<g id="webuis" class="package" transform="translate( 2408.4000000000005 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>
+ <rect class="package" x="0" width="36.300000000000004" height="101.43" y="0" style="fill:slateblue;"/>
+ <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="100.43">Web UIs</text>
<g transform="translate(0 3.2)">
<g id="browserui" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -17208,10 +17190,10 @@
</g>
<g id="jrt" class="package" transform="translate( 2446.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="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>
- <g transform="translate(0 3.2)">
- <g id="jrt_plat" transform="translate(0 0)" class="collection">
+ <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Java Runtime</text>
+ <g transform="translate(0 3.2)">
+ <g id="jrt_plat" transform="translate(0 18.8)" 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">JRT Platform Interfaces</text>
<g transform="translate(0 6.299999999999999)">
@@ -17232,17 +17214,23 @@
</g>
</g>
</g>
- <g id="java_stubs" transform="translate(0 56.400000000000006)" 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">Java Stubs</text>
- <g transform="translate(0 6.299999999999999)"/>
+ <g id="jrt_info" 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">jrt_info</text>
+ <g transform="translate(0 6.299999999999999)">
+ <g id="sf" 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">sf</text>
+ </g>
+ </g>
</g>
</g>
</g>
<g id="conntools" class="package" transform="translate( 2476.8000000000006 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>
+ <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:moccasin;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Connectivity Tools</text>
<g transform="translate(0 3.2)">
<g id="nettools" transform="translate(0 0)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17265,8 +17253,8 @@
</g>
<g id="rndtools" class="package" transform="translate( 2506.8000000000006 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="72.60000000000001" height="82.63000000000001" y="0" style="fill:darkgray;"/>
- <text text-anchor="middle" class="package" width="72.60000000000001" x="36.300000000000004" y="81.63000000000002">R&D tools</text>
+ <rect class="package" x="0" width="72.60000000000001" height="101.43" y="0" style="fill:darkgray;"/>
+ <text text-anchor="middle" class="package" width="72.60000000000001" x="36.300000000000004" y="100.43">R&D tools</text>
<g transform="translate(0 3.2)">
<g id="creator" transform="translate(0 56.400000000000006)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17348,8 +17336,8 @@
</g>
<g id="helps" class="package" transform="translate( 3185.700000000001 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>
+ <rect class="package" x="0" width="27.900000000000002" height="201.82999999999998" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="200.82999999999998">Help Apps</text>
<g transform="translate(0 3.2)">
<g id="csxhelp" transform="translate(0 18.8)" class="collection placeholder">
<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17383,8 +17371,8 @@
</g>
<g id="techview" class="package" transform="translate( 3215.700000000001 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>
+ <rect class="package" x="0" width="27.900000000000002" height="201.82999999999998" y="0" style="fill:orange;"/>
+ <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="200.82999999999998">Techview</text>
<g transform="translate(0 3.2)">
<g id="buildverification" transform="translate(0 94)" class="collection">
<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -17435,7 +17423,7 @@
</g>
</g>
</g>
- <g id="legend-root" class="legend" transform="translate(4587.579500000001 681.49) translate(303.3205 0) scale(12.899622676344002) translate(-303.3205)">
+ <g id="legend-root" class="legend" transform="translate(4587.579500000001 700.29) translate(303.3205 0) scale(12.899622676344002) 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>
@@ -17526,7 +17514,7 @@
<g id="s4-overlay0" class="cmp placeholder">
<use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
<use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
- <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Component (138)</text>
+ <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Component (135)</text>
</g>
</g>
</g>
@@ -17561,7 +17549,7 @@
<text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
<tspan dy="-1em" x="250.875">108 Packages</tspan>
<tspan dy="1em" x="250.875">594 Collections</tspan>
- <tspan dy="1em" x="250.875">2522 Components</tspan>
+ <tspan dy="1em" x="250.875">2520 Components</tspan>
</text>
</g>
</g>
--- a/symbian3/single/sysdefs/system_model.xml Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml Wed Jun 09 12:29:36 2010 +0100
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!ATTLIST component
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- deprecated CDATA #IMPLIED
- introduced CDATA #IMPLIED
- contract CDATA #IMPLIED
- plugin (Y|N) "N"
- filter CDATA #IMPLIED
- class NMTOKENS #IMPLIED
- supports CDATA #IMPLIED
- purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!ATTLIST unit
- mrp CDATA #IMPLIED
- filter CDATA #IMPLIED
- bldFile CDATA #IMPLIED
- root CDATA #IMPLIED
- version NMTOKEN #IMPLIED
- prebuilt NMTOKEN #IMPLIED
- late (Y|N) #IMPLIED
- priority CDATA #IMPLIED
->
-]>
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+ levels NMTOKENS #IMPLIED
+ span CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a package or prebuilt -->
+<!ATTLIST component
+ name CDATA #REQUIRED
+ long-name CDATA #IMPLIED
+ deprecated CDATA #IMPLIED
+ introduced CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ plugin (Y|N) "N"
+ filter CDATA #IMPLIED
+ class NMTOKENS #IMPLIED
+ supports CDATA #IMPLIED
+ purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile may someday be removed in favour of mrp -->
+<!ATTLIST unit
+ mrp CDATA #IMPLIED
+ filter CDATA #IMPLIED
+ bldFile CDATA #IMPLIED
+ root CDATA #IMPLIED
+ version NMTOKEN #IMPLIED
+ prebuilt NMTOKEN #IMPLIED
+ late (Y|N) #IMPLIED
+ priority CDATA #IMPLIED
+>
+]>
<SystemDefinition schema="2.0.1" name="Symbian^3">
<systemModel>
<layer name="adaptation" long-name="Adaptation" levels="low mw high">
@@ -653,7 +653,7 @@
<unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
</component>
<component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory
Consider moving IBY file to one of the above as well and removing this component entirely -->
<unit bldFile="os/ossrv/ofdbus/group"/>
</component>
@@ -1071,7 +1071,7 @@
<unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
</component>
<component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
may need to -->
<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
</component>
@@ -1085,7 +1085,7 @@
<unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
This needs to be kept around until configuration is in place -->
<unit bldFile="os/devicesrv/resourcemgmt/group"/>
</component>
@@ -2071,7 +2071,7 @@
<unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
</component>
<component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
Also move to a standard component location, not under effectspresets -->
<unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
<unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2477,7 +2477,7 @@
</component>
</collection>
<collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
Either move into the units' directories, or create a new textandlocutils directory -->
<component name="numbergrouping" filter="s60" long-name="Number Grouping">
<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2523,8 +2523,8 @@
<block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
<collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here.
- Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here.
+ Either destribute to other components or use the new feature flags confguration mechanisms.
Remove this component and uncomment the other units when fixed-->
<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
</component>
@@ -2916,7 +2916,7 @@
</component>
</collection>
<collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
<component name="cfw" filter="s60" long-name="Context Framework">
<!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -3985,8 +3985,8 @@
</component>
</collection>
<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
- Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
or maybe split the collection into more reasonable groups -->
<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -4925,7 +4925,7 @@
<!-- <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
</component>
<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
This is needed for #includes of configured component until congigiration is in place -->
<unit bldFile="mw/remotestorage/remotestoragefw/group"/>
</component>
@@ -5180,9 +5180,9 @@
<collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
<!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
- <unit bldFile="upnpharvester/common/cmsettings/group"/>
- <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+ <unit bldFile="upnpharvester/common/cmsettings/group"/>
+ <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
<unit bldFile="upnpharvester/common/dbmanager/group"/>-->
</component>
<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
@@ -5380,15 +5380,15 @@
<component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
<unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
</component>
-<!-- commented out in bld.inf. Should this be deleted?
- <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
- <unit bldFile="usbclasses/ptpstack/group"/>
- </component>
- <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
- <unit bldFile="usbclasses/sicdusbplugin/group"/>
- </component>
- <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
- <unit bldFile="usbclasses/ptpserver/group"/>
+<!-- commented out in bld.inf. Should this be deleted?
+ <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+ <unit bldFile="usbclasses/ptpstack/group"/>
+ </component>
+ <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+ <unit bldFile="usbclasses/sicdusbplugin/group"/>
+ </component>
+ <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+ <unit bldFile="usbclasses/ptpserver/group"/>
</component>-->
<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5494,7 +5494,7 @@
<block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
<collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
<component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
</component>
<component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
@@ -5510,11 +5510,11 @@
<unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
</component>
<component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
<unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
</component>
<component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
<unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
</component>
<component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
@@ -6044,11 +6044,11 @@
<unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
</component>
<component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
</component>
<component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
<unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
</component>
<component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
@@ -6082,7 +6082,7 @@
</collection>
<collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
Can remove this once configuration is in place-->
<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
</component>
@@ -7039,10 +7039,10 @@
<component name="fontprovider" filter="s60" long-name="Font Provider">
<unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
</component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+ <component id="s60_fonts" filter="s60" name="S60 Fonts">
+ <unit bldFile="fontsupport/fontutils/group"/>
+ </component>
-->
<component name="fontutils" filter="sf_build" long-name="Font Utils">
<unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7307,7 +7307,7 @@
<unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
</component>
<component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
</component>
@@ -7329,7 +7329,7 @@
<unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
</component>
<component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
</component>
@@ -7738,7 +7738,7 @@
<unit bldFile="mw/web/codhandler/roapapp/group"/>
</component>
<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="mw/web/codhandler/group"/>
</component>
@@ -7767,7 +7767,7 @@
<!--<unit bldFile="widgets/widgetstartup/group"/>-->
</component>
<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed
#included .hrh file needs to be #included in each of the other components -->
<unit bldFile="mw/web/widgets/group"/>
</component>
@@ -8352,7 +8352,7 @@
<unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
</component>
<component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!-- consider distributing this into the above components, or collapse the collection into a single component.
+<!-- consider distributing this into the above components, or collapse the collection into a single component.
The latter is a better option since clients and sevrers are rarely separate components -->
<unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
</component>
@@ -8508,7 +8508,7 @@
<unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
</component>
<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
or all #includes removed from here, and it renamed Device Diagnostics ROM -->
<unit bldFile="app/devicecontrol/devicediagnostics/group"/>
</component>
@@ -9545,7 +9545,7 @@
<unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
</component>
<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
alternatively, move the exports into a RM Config component-->
<unit bldFile="app/commonemail/meetingrequest/group"/>
</component>
@@ -9777,8 +9777,8 @@
<unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
<unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
<unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditor/plugins/drawplugin/group"/>
-->
</component>
<component name="editorprovider" filter="s60" long-name="Image Editor Provider">
@@ -9812,8 +9812,8 @@
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
<unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
- <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+ <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
-->
</component>
<component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
@@ -10177,7 +10177,7 @@
<collection name="scrsaver" long-name="Screen Saver" level="plugin">
<component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
</component>
<component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
@@ -10537,7 +10537,7 @@
<unit bldFile="app/webuis/pushmtm/plugins/group"/>
</component>
<component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
component and move it down a diretcory, or make separate independent components in this collection -->
<unit bldFile="app/webuis/pushmtm/group"/>
</component>
@@ -10555,9 +10555,9 @@
<unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
-<unit bldFile="app/jrt/java_stubs/group"/>
+<collection name="java_build" long-name="JRT Build" level="util">
+<component name="java_build_sf" filter="sf_build" long-name="JRT Build for Symbian Foundation">
+<unit bldFile="app/jrt/group/sf"/>
</component>
</collection>
</block>
--- a/symbian3/single/sysdefs/system_model_3.0.xml Wed Jun 09 11:38:07 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml Wed Jun 09 12:29:36 2010 +0100
@@ -1450,12 +1450,8 @@
-<component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-<unit bldFile="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
+
+
</collection>
<collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
<component id="networkingrom" name="Networking ROM" purpose="mandatory">
@@ -1633,9 +1629,7 @@
<component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
</component>
-<component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
-<unit bldFile="/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
+
<component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
</component>
@@ -10967,9 +10961,9 @@
<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
</component>
</collection>
-<collection id="java_stubs" name="Java Stubs" level="util">
-<component id="java_stubs_build" filter="s60" name="JRT Stubs Build">
-<unit bldFile="/app/jrt/java_stubs/group"/>
+<collection id="java_build" name="JRT Build" level="util">
+<component id="java_build_sf" filter="sf_build" name="JRT Build for Symbian Foundation">
+<unit bldFile="/app/jrt/group/sf"/>
</component>
</collection>
</package>
