--- a/symbian3/app/techview/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
+++ b/symbian3/app/techview/package_definition.xml	Thu Jan 28 14:49:47 2010 +0000
@@ -1,130 +1,246 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!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>
- <!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>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-<collection name="buildverification" long-name="Build Verification" level="services">
-<component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
-<unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-</component>
-<component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
-<unit bldFile="/sf/app/techview/buildverification/smoketest/Group" mrp="/sf/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-</component>
-</collection>
-<collection name="networkingutils" long-name="Networking Utils" level="utils">
-<component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development">
-<unit mrp="/sf/app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
-</component>
-<component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development">
-<unit mrp="/sf/app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
-</component>
-</collection>
-<collection name="testapps" long-name="Test Apps" level="utils">
-<component name="rschandler" long-name="Resource Handler" deprecated="tb92" purpose="development">
-<unit mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
-</component>
-</collection>
-<collection name="techview_info" long-name="Techview Info" level="apps3">
-<component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!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 name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+        <collection name="buildverification" long-name="Build Verification" level="services">
+          <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+            <unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+          </component>
+          <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development">
+            <unit bldFile="/sf/app/techview/buildverification/smoketest/Group" mrp="/sf/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+          </component>
+        </collection>
+        <collection name="techviewplat" long-name="Techview Platform" level="services">
+          <component name="techviewuiklaf" long-name="UIKLAF" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewplat/techviewuiklaf/GROUP" mrp="/sf/app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
+          </component>
+          <component name="eikstdtv" long-name="EIKSTD" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewplat/eikstd/group" mrp="/sf/app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
+          </component>
+          <component name="feps" long-name="FEPS" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewplat/feps/group" mrp="/sf/app/techview/techviewplat/feps/group/techview_feps.mrp"/>
+          </component>
+        </collection>
+        <collection name="techviewui" long-name="Techview UI" level="ui">
+          <component name="techviewextras" long-name="Extras" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewui/techviewextras/group" mrp="/sf/app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
+          </component>
+          <component name="statuspane" long-name="Status Pane" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewui/statuspane/group" mrp="/sf/app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
+          </component>
+          <component name="shell" long-name="Shell" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewui/shell/group" mrp="/sf/app/techview/techviewui/shell/group/techview_shell.mrp"/>
+          </component>
+          <component name="startuptv" long-name="Techview Startup" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/techviewui/startup/group" mrp="/sf/app/techview/techviewui/startup/group/techview_startup.mrp"/>
+          </component>
+        </collection>
+        <collection name="controlpanel" long-name="Control Panel" level="ui">
+          <component name="fepsetup" long-name="FEP Setup" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/controlpanel/fepsetup/group" mrp="/sf/app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
+          </component>
+          <component name="cctlcolscheme" long-name="Colour Scheme Control" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/controlpanel/cctlcolscheme/group" mrp="/sf/app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
+          </component>
+          <component name="soundsetup" long-name="Sound Setup" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/controlpanel/soundsetup/group" mrp="/sf/app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
+          </component>
+          <component name="keyclickref" long-name="Key Click Ref" filter="techview" purpose="development" plugin="Y">
+            <unit bldFile="/sf/app/techview/controlpanel/keyclickref/Group" mrp="/sf/app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
+          </component>
+        </collection>
+        <collection name="pimapps" long-name="PIM Apps" level="apps3">
+          <component name="contacui" long-name="Contacts UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/pimapps/contacui/group" mrp="/sf/app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
+          </component>
+          <component name="agenda" long-name="Agenda UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/pimapps/agenda/group" mrp="/sf/app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
+          </component>
+          <component name="contactstechview" long-name="Contacts" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/pimapps/contactstechview/group" mrp="/sf/app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
+          </component>
+        </collection>
+        <collection name="securityapps" long-name="Security Apps" level="apps3">
+          <component name="secuitv" long-name="Techview Security UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/securityapps/secui/group" mrp="/sf/app/techview/securityapps/secui/group/techview_secui.mrp"/>
+          </component>
+          <component name="securityupstechview" long-name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
+            <unit bldFile="/sf/app/techview/securityapps/securityupstechview/group" mrp="/sf/app/techview/securityapps/securityupstechview/group/security_ups_techview.mrp"/>
+          </component>
+        </collection>
+        <collection name="utilityapps" long-name="Utility Apps" level="apps2">
+          <component name="helptechview" long-name="Help" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/utilityapps/helptechview/group" mrp="/sf/app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
+          </component>
+          <component name="timew" long-name="World Time" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/utilityapps/timew/group" mrp="/sf/app/techview/utilityapps/timew/group/techview_timew.mrp"/>
+          </component>
+          <component name="cpumonitor" long-name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
+            <unit bldFile="/sf/app/techview/utilityapps/cpumonitor/group" mrp="/sf/app/techview/utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
+          </component>
+        </collection>
+        <collection name="installationapps" long-name="Installation Apps" level="apps2">
+          <component name="installapp" long-name="Install App" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/installationapps/installapp/group" mrp="/sf/app/techview/installationapps/installapp/group/techview_installapp.mrp"/>
+          </component>
+        </collection>
+        <collection name="messagingapps" long-name="Messaging Apps" level="apps2">
+          <component name="messagingui" long-name="Messaging UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/messagingapps/messagingui/Group" mrp="/sf/app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
+          </component>
+        </collection>
+        <collection name="telephonyapps" long-name="Telephony Apps" level="apps1">
+          <component name="techviewphoneui" long-name="Phone UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/telephonyapps/techviewphoneui/group" mrp="/sf/app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
+          </component>
+        </collection>
+        <collection name="networkingapps" long-name="Networking Apps" level="apps1">
+          <component name="iapstatusapp" long-name="IAP Status App" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/networkingapps/iapstatusapp/group" mrp="/sf/app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
+          </component>
+          <component name="networkingagentnotifier" long-name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" plugin="Y">
+            <unit bldFile="/sf/app/techview/networkingapps/networkingagentnotifier/group" mrp="/sf/app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
+          </component>
+          <component name="techviewvpnui" long-name="VPN UI" filter="techview" introduced="7.0" purpose="development">
+            <unit bldFile="/sf/app/techview/networkingapps/techviewvpnui/group" mrp="/sf/app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
+          </component>
+        </collection>
+        <collection name="networkingutils" long-name="Networking Utils" level="utils">
+          <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
+            <unit mrp="/sf/app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="/sf/app/techview/networkingutils/ipadministrationtool/group"/>
+          </component>
+          <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
+            <unit mrp="/sf/app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="/sf/app/techview/networkingutils/nameresolverutility/group"/>
+          </component>
+        </collection>
+        <collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1">
+          <component name="techviewusbui" long-name="USB UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/shortlinkapps/techviewusbui/group" mrp="/sf/app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
+          </component>
+          <component name="bluetoothui" long-name="Bluetooth UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/shortlinkapps/bluetoothui/group" mrp="/sf/app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
+          </component>
+          <component name="reftsp" long-name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" plugin="Y">
+            <unit bldFile="/sf/app/techview/shortlinkapps/reftsp/group" mrp="/sf/app/techview/shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
+          </component>
+        </collection>
+        <collection name="testapps" long-name="Test Apps" level="utils">
+          <component name="simpleapp" long-name="Simple App" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/testapps/simpleapp/group" mrp="/sf/app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
+          </component>
+          <component name="statdevice" long-name="STAT Device" filter="techview" purpose="development">
+            <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="/sf/os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
+          </component>
+          <component name="rschandlerui" long-name="Resource Handler UI" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/testapps/rschandler/TVResourceHandler/group" mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
+          </component>
+          <component name="graphicstestutils" long-name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
+            <unit bldFile="/sf/app/techview/testapps/graphicstestutils/group" mrp="/sf/app/techview/testapps/graphicstestutils/group/graphics_testutils.mrp"/>
+          </component>
+          <component name="rschandler" long-name="Resource Handler" deprecated="^3" purpose="development" filter="test">
+            <unit mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="/sf/app/techview/testapps/rschandler/TVResourceHandler/group"/>
+          </component>
+        </collection>
+        <collection name="avapps" long-name="A/V Apps" level="apps3">
+          <component name="techviewaudio" long-name="Audio" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/avapps/techviewaudio/Group" mrp="/sf/app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
+          </component>
+        </collection>
+        <collection name="toolkit" long-name="Toolkit" level="utils">
+          <component name="romkit" long-name="ROM Kit" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/toolkit/romkit/group" mrp="/sf/app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
+          </component>
+          <component name="romimages" long-name="ROM Images" filter="techview" purpose="development">
+            <unit bldFile="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tb92sfrom_obys" mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tb92sfrom_obys/reference_roms_tb92.mrp" version="tb92"/>
+          </component>
+          <component name="configfiles" long-name="Configuration Files" filter="techview" purpose="development">
+            <unit mrp="/sf/app/techview/toolkit/configfiles/techview_epoc_ini.mrp"/>
+          </component>
+          <component name="cdborphans" long-name="CDB Orphan File Handler" filter="techview" purpose="development">
+            <unit bldFile="/sf/app/techview/toolkit/cdborphans/group" mrp="/sf/app/techview/toolkit/cdborphans/group/techview_cdb_dummy_orphanheader_checker.mrp"/>
+          </component>
+        </collection>
+        <collection name="techview_info" long-name="Techview Info" level="apps3">
+          <component name="techview_metadata" long-name="Techview Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>