# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1280178229 -3600
# Node ID 8a720eca298ed6a77ead5f8b3ab97254a744a0de
# Parent  9e7a463cb65728fface68d91a67066b1c7a559cd
Update package models from latest system model  (platform@ec09b0ceb772)

diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/adaptation/beagleboard/package_definition.xml
--- a/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/adaptation/codecs.aricent/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adaptation/codecs.aricent/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
+<collection name="utilities" long-name="Aricent Utilities">
+<component name="ariprocessengine" long-name="Aricent Process Engine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+</component>
+<component name="aristatemachine" long-name="Aricent State Machine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+</component>
+</collection>
+<collection name="aaclc_enc" level="plugin">
+<component name="ariaaclcencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_dec" level="plugin">
+<component name="ariamrnbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_enc" level="plugin">
+<component name="ariamrnbencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrwb_dec" level="plugin">
+<component name="ariamrwbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="h264_dec" level="plugin">
+<component name="arih264dechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+</component>
+</collection>
+<collection name="h264_enc" level="plugin">
+<component name="arih264enchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+</component>
+</collection>
+<collection name="heaac_dec" level="plugin">
+<component name="ariheaacdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp3_dec" level="plugin">
+<component name="arimp3decmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp4asp_dec" level="plugin">
+<component name="arimpeg4aspdechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+</component>
+</collection>
+<collection name="mp4sp_enc" level="plugin">
+<component name="arimp4spenchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/adaptation/qemu/package_definition.xml
--- a/CompilerCompatibility/adaptation/qemu/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/adaptation/qemu/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/adaptation/stubs/package_definition.xml
--- a/CompilerCompatibility/adaptation/stubs/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/adaptation/stubs/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="stubs" level="high" long-name="Stubs" levels="stub">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/camera/package_definition.xml
--- a/CompilerCompatibility/app/camera/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/camera/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="camera" level="apps" long-name="Camera Apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/commonemail/package_definition.xml
--- a/CompilerCompatibility/app/commonemail/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/commonemail/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/conntools/package_definition.xml
--- a/CompilerCompatibility/app/conntools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/conntools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/contacts/package_definition.xml
--- a/CompilerCompatibility/app/contacts/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/contacts/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/contentcontrol/package_definition.xml
--- a/CompilerCompatibility/app/contentcontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/contentcontrol/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/conversations/package_definition.xml
--- a/CompilerCompatibility/app/conversations/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/conversations/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/devicecontrol/package_definition.xml
--- a/CompilerCompatibility/app/devicecontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/devicecontrol/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/dictionary/package_definition.xml
--- a/CompilerCompatibility/app/dictionary/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/dictionary/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/files/package_definition.xml
--- a/CompilerCompatibility/app/files/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/files/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/graphicsuis/package_definition.xml
--- a/CompilerCompatibility/app/graphicsuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/graphicsuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/helps/package_definition.xml
--- a/CompilerCompatibility/app/helps/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/helps/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/homescreen/package_definition.xml
--- a/CompilerCompatibility/app/homescreen/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/homescreen/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/homescreentools/package_definition.xml
--- a/CompilerCompatibility/app/homescreentools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/homescreentools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/im/package_definition.xml
--- a/CompilerCompatibility/app/im/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/im/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/imgeditor/package_definition.xml
--- a/CompilerCompatibility/app/imgeditor/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/imgeditor/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/iptelephony/package_definition.xml
--- a/CompilerCompatibility/app/iptelephony/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/iptelephony/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/jrt/package_definition.xml
--- a/CompilerCompatibility/app/jrt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/jrt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/location/package_definition.xml
--- a/CompilerCompatibility/app/location/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/location/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/messaging/package_definition.xml
--- a/CompilerCompatibility/app/messaging/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/messaging/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/mmsharinguis/package_definition.xml
--- a/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/musicplayer/package_definition.xml
--- a/CompilerCompatibility/app/musicplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/musicplayer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/organizer/package_definition.xml
--- a/CompilerCompatibility/app/organizer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/organizer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/phone/package_definition.xml
--- a/CompilerCompatibility/app/phone/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/phone/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/photos/package_definition.xml
--- a/CompilerCompatibility/app/photos/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/photos/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/podcatcher/package_definition.xml
--- a/CompilerCompatibility/app/podcatcher/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/podcatcher/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/printing/package_definition.xml
--- a/CompilerCompatibility/app/printing/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/printing/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="printing" level="services" long-name="Printing" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/profile/package_definition.xml
--- a/CompilerCompatibility/app/profile/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/profile/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="profile" level="apps" long-name="Profiles" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/radio/package_definition.xml
--- a/CompilerCompatibility/app/radio/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/radio/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/rndtools/package_definition.xml
--- a/CompilerCompatibility/app/rndtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/rndtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/screensaver/package_definition.xml
--- a/CompilerCompatibility/app/screensaver/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/screensaver/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/settingsuis/package_definition.xml
--- a/CompilerCompatibility/app/settingsuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/settingsuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/speechsrv/package_definition.xml
--- a/CompilerCompatibility/app/speechsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/speechsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/techview/package_definition.xml
--- a/CompilerCompatibility/app/techview/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/techview/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<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">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/utils/package_definition.xml
--- a/CompilerCompatibility/app/utils/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/utils/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="utils" level="apps" long-name="Utility Apps" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/videoplayer/package_definition.xml
--- a/CompilerCompatibility/app/videoplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/videoplayer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/videotelephony/package_definition.xml
--- a/CompilerCompatibility/app/videotelephony/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/videotelephony/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/voicerec/package_definition.xml
--- a/CompilerCompatibility/app/voicerec/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/voicerec/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/app/webuis/package_definition.xml
--- a/CompilerCompatibility/app/webuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/app/webuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/accesssec/package_definition.xml
--- a/CompilerCompatibility/mw/accesssec/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/accesssec/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/appinstall/package_definition.xml
--- a/CompilerCompatibility/mw/appinstall/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/appinstall/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/appsupport/package_definition.xml
--- a/CompilerCompatibility/mw/appsupport/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/appsupport/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/btservices/package_definition.xml
--- a/CompilerCompatibility/mw/btservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/btservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/camerasrv/package_definition.xml
--- a/CompilerCompatibility/mw/camerasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/camerasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/classicui/package_definition.xml
--- a/CompilerCompatibility/mw/classicui/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/classicui/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/dlnasrv/package_definition.xml
--- a/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/drm/package_definition.xml
--- a/CompilerCompatibility/mw/drm/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/drm/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/gsprofilesrv/package_definition.xml
--- a/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/hapticsservices/package_definition.xml
--- a/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/helix/package_definition.xml
--- a/CompilerCompatibility/mw/helix/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/helix/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/homescreensrv/package_definition.xml
--- a/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/imghandling/package_definition.xml
--- a/CompilerCompatibility/mw/imghandling/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/imghandling/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/imsrv/package_definition.xml
--- a/CompilerCompatibility/mw/imsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/imsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/inputmethods/package_definition.xml
--- a/CompilerCompatibility/mw/inputmethods/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/inputmethods/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/ipappprotocols/package_definition.xml
--- a/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/ipappsrv/package_definition.xml
--- a/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/ipconnmgmt/package_definition.xml
--- a/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/legacypresence/package_definition.xml
--- a/CompilerCompatibility/mw/legacypresence/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/legacypresence/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/locationsrv/package_definition.xml
--- a/CompilerCompatibility/mw/locationsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/locationsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/mds/package_definition.xml
--- a/CompilerCompatibility/mw/mds/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/mds/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/messagingmw/package_definition.xml
--- a/CompilerCompatibility/mw/messagingmw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/messagingmw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/metadatasrv/package_definition.xml
--- a/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/mmappfw/package_definition.xml
--- a/CompilerCompatibility/mw/mmappfw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/mmappfw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/mmmw/package_definition.xml
--- a/CompilerCompatibility/mw/mmmw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/mmmw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/mmuifw/package_definition.xml
--- a/CompilerCompatibility/mw/mmuifw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/mmuifw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/netprotocols/package_definition.xml
--- a/CompilerCompatibility/mw/netprotocols/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/netprotocols/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/phonesrv/package_definition.xml
--- a/CompilerCompatibility/mw/phonesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/phonesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/platformtools/package_definition.xml
--- a/CompilerCompatibility/mw/platformtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/platformtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/qt/package_definition.xml
--- a/CompilerCompatibility/mw/qt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/qt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
@@ -74,6 +74,14 @@
 <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
+<collection name="qt_tests" long-name="Qt Tests" level="app">
+<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
+<unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro" makeArgs="-r"/>
+</component>
+<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
+<unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
+</component>
+</collection>
 </block>
   </layer>
  </systemModel>
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/remoteconn/package_definition.xml
--- a/CompilerCompatibility/mw/remoteconn/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/remoteconn/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/remotemgmt/package_definition.xml
--- a/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/remotestorage/package_definition.xml
--- a/CompilerCompatibility/mw/remotestorage/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/remotestorage/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/securitysrv/package_definition.xml
--- a/CompilerCompatibility/mw/securitysrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/securitysrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/serviceapi/package_definition.xml
--- a/CompilerCompatibility/mw/serviceapi/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapi/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/serviceapifw/package_definition.xml
--- a/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/shortlinkconn/package_definition.xml
--- a/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/srvdiscovery/package_definition.xml
--- a/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/svgt/package_definition.xml
--- a/CompilerCompatibility/mw/svgt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/svgt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/uiaccelerator/package_definition.xml
--- a/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/uiresources/package_definition.xml
--- a/CompilerCompatibility/mw/uiresources/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/uiresources/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
@@ -159,7 +159,7 @@
 <component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
 <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
 </component>
-<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme">
+<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme" class="config">
 <unit bldFile="/sf/mw/uiresources/skins/Symbian/group"/>
 </component>
 <component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/uitools/package_definition.xml
--- a/CompilerCompatibility/mw/uitools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/uitools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/usbservices/package_definition.xml
--- a/CompilerCompatibility/mw/usbservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/usbservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/videoutils/package_definition.xml
--- a/CompilerCompatibility/mw/videoutils/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/videoutils/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/vpnclient/package_definition.xml
--- a/CompilerCompatibility/mw/vpnclient/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/vpnclient/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/web/package_definition.xml
--- a/CompilerCompatibility/mw/web/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/web/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/websrv/package_definition.xml
--- a/CompilerCompatibility/mw/websrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/websrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/mw/wirelessacc/package_definition.xml
--- a/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/boardsupport/package_definition.xml
--- a/CompilerCompatibility/os/boardsupport/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/boardsupport/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/bt/package_definition.xml
--- a/CompilerCompatibility/os/bt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/bt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/buildtools/package_definition.xml
--- a/CompilerCompatibility/os/buildtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/buildtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/cellularsrv/package_definition.xml
--- a/CompilerCompatibility/os/cellularsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/cellularsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/commsfw/package_definition.xml
--- a/CompilerCompatibility/os/commsfw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/commsfw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/deviceplatformrelease/package_definition.xml
--- a/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
@@ -139,9 +139,6 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
-</component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
 <collection name="s60bld" long-name="S60 Build">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/devicesrv/package_definition.xml
--- a/CompilerCompatibility/os/devicesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/devicesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/graphics/package_definition.xml
--- a/CompilerCompatibility/os/graphics/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/graphics/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/imagingext/package_definition.xml
--- a/CompilerCompatibility/os/imagingext/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/imagingext/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/kernelhwsrv/package_definition.xml
--- a/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/mm/package_definition.xml
--- a/CompilerCompatibility/os/mm/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/mm/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/networkingsrv/package_definition.xml
--- a/CompilerCompatibility/os/networkingsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/networkingsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/osrndtools/package_definition.xml
--- a/CompilerCompatibility/os/osrndtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/osrndtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/ossrv/package_definition.xml
--- a/CompilerCompatibility/os/ossrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/ossrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/persistentdata/package_definition.xml
--- a/CompilerCompatibility/os/persistentdata/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/persistentdata/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/security/package_definition.xml
--- a/CompilerCompatibility/os/security/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/security/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/textandloc/package_definition.xml
--- a/CompilerCompatibility/os/textandloc/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/textandloc/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/usb/package_definition.xml
--- a/CompilerCompatibility/os/usb/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/usb/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/wlan/package_definition.xml
--- a/CompilerCompatibility/os/wlan/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/wlan/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
diff -r 9e7a463cb657 -r 8a720eca298e CompilerCompatibility/os/xmlsrv/package_definition.xml
--- a/CompilerCompatibility/os/xmlsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/CompilerCompatibility/os/xmlsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/adaptation/beagleboard/package_definition.xml
--- a/symbian3/adaptation/beagleboard/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/adaptation/beagleboard/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/adaptation/codecs.aricent/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/codecs.aricent/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!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>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adaptation" long-name="Adaptation" levels="low mw high">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
+<collection name="utilities" long-name="Aricent Utilities">
+<component name="ariprocessengine" long-name="Aricent Process Engine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+</component>
+<component name="aristatemachine" long-name="Aricent State Machine">
+<unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+</component>
+</collection>
+<collection name="aaclc_enc" level="plugin">
+<component name="ariaaclcencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_dec" level="plugin">
+<component name="ariamrnbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrnb_enc" level="plugin">
+<component name="ariamrnbencmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+</component>
+</collection>
+<collection name="amrwb_dec" level="plugin">
+<component name="ariamrwbdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="h264_dec" level="plugin">
+<component name="arih264dechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+</component>
+</collection>
+<collection name="h264_enc" level="plugin">
+<component name="arih264enchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+</component>
+</collection>
+<collection name="heaac_dec" level="plugin">
+<component name="ariheaacdecmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp3_dec" level="plugin">
+<component name="arimp3decmmfcodec">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+</component>
+</collection>
+<collection name="mp4asp_dec" level="plugin">
+<component name="arimpeg4aspdechwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+</component>
+</collection>
+<collection name="mp4sp_enc" level="plugin">
+<component name="arimp4spenchwdevice">
+<unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/adaptation/qemu/package_definition.xml
--- a/symbian3/adaptation/qemu/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/adaptation/qemu/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/adaptation/stubs/package_definition.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/adaptation/stubs/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
    <block name="stubs" level="high" long-name="Stubs" levels="stub">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/camera/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="camera" level="apps" long-name="Camera Apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/commonemail/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/conntools/package_definition.xml
--- a/symbian3/app/conntools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/conntools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/contacts/package_definition.xml
--- a/symbian3/app/contacts/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/contacts/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/contentcontrol/package_definition.xml
--- a/symbian3/app/contentcontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/contentcontrol/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/conversations/package_definition.xml
--- a/symbian3/app/conversations/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/conversations/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/devicecontrol/package_definition.xml
--- a/symbian3/app/devicecontrol/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/devicecontrol/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/dictionary/package_definition.xml
--- a/symbian3/app/dictionary/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/dictionary/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/files/package_definition.xml
--- a/symbian3/app/files/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/files/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/graphicsuis/package_definition.xml
--- a/symbian3/app/graphicsuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/graphicsuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/helps/package_definition.xml
--- a/symbian3/app/helps/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/helps/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/homescreen/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/homescreentools/package_definition.xml
--- a/symbian3/app/homescreentools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/homescreentools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/im/package_definition.xml
--- a/symbian3/app/im/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/im/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/imgeditor/package_definition.xml
--- a/symbian3/app/imgeditor/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/imgeditor/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/iptelephony/package_definition.xml
--- a/symbian3/app/iptelephony/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/iptelephony/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/jrt/package_definition.xml
--- a/symbian3/app/jrt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/jrt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/location/package_definition.xml
--- a/symbian3/app/location/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/location/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/messaging/package_definition.xml
--- a/symbian3/app/messaging/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/messaging/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/mmsharinguis/package_definition.xml
--- a/symbian3/app/mmsharinguis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/musicplayer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/organizer/package_definition.xml
--- a/symbian3/app/organizer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/organizer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/phone/package_definition.xml
--- a/symbian3/app/phone/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/phone/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/photos/package_definition.xml
--- a/symbian3/app/photos/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/photos/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/podcatcher/package_definition.xml
--- a/symbian3/app/podcatcher/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/podcatcher/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/printing/package_definition.xml
--- a/symbian3/app/printing/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/printing/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="printing" level="services" long-name="Printing" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/profile/package_definition.xml
--- a/symbian3/app/profile/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/profile/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="profile" level="apps" long-name="Profiles" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/radio/package_definition.xml
--- a/symbian3/app/radio/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/radio/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/rndtools/package_definition.xml
--- a/symbian3/app/rndtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/rndtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="rndtools" level="services" long-name="R&amp;D tools" levels="support generic test util">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/screensaver/package_definition.xml
--- a/symbian3/app/screensaver/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/screensaver/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/settingsuis/package_definition.xml
--- a/symbian3/app/settingsuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/settingsuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/speechsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/techview/package_definition.xml
--- a/symbian3/app/techview/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/techview/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<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">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/utils/package_definition.xml
--- a/symbian3/app/utils/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/utils/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="utils" level="apps" long-name="Utility Apps" levels="app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/videoplayer/package_definition.xml
--- a/symbian3/app/videoplayer/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/videoplayer/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/videotelephony/package_definition.xml
--- a/symbian3/app/videotelephony/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/videotelephony/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/voicerec/package_definition.xml
--- a/symbian3/app/voicerec/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/voicerec/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/app/webuis/package_definition.xml
--- a/symbian3/app/webuis/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/app/webuis/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/accesssec/package_definition.xml
--- a/symbian3/mw/accesssec/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/accesssec/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/appinstall/package_definition.xml
--- a/symbian3/mw/appinstall/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/appinstall/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/appsupport/package_definition.xml
--- a/symbian3/mw/appsupport/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/appsupport/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/btservices/package_definition.xml
--- a/symbian3/mw/btservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/btservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/camerasrv/package_definition.xml
--- a/symbian3/mw/camerasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/camerasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/classicui/package_definition.xml
--- a/symbian3/mw/classicui/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/classicui/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/dlnasrv/package_definition.xml
--- a/symbian3/mw/dlnasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="dlnasrv" level="specific" long-name="DLNA Services" levels="stack server ctrl framework plugin">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/drm/package_definition.xml
--- a/symbian3/mw/drm/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/drm/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/gsprofilesrv/package_definition.xml
--- a/symbian3/mw/gsprofilesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/gsprofilesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/hapticsservices/package_definition.xml
--- a/symbian3/mw/hapticsservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/hapticsservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/helix/package_definition.xml
--- a/symbian3/mw/helix/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/helix/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="helix" level="generic" long-name="Helix" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/homescreensrv/package_definition.xml
--- a/symbian3/mw/homescreensrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/homescreensrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/imghandling/package_definition.xml
--- a/symbian3/mw/imghandling/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/imghandling/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/imsrv/package_definition.xml
--- a/symbian3/mw/imsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/imsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/inputmethods/package_definition.xml
--- a/symbian3/mw/inputmethods/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/inputmethods/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/ipappprotocols/package_definition.xml
--- a/symbian3/mw/ipappprotocols/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/ipappprotocols/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/ipappsrv/package_definition.xml
--- a/symbian3/mw/ipappsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/ipappsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/ipconnmgmt/package_definition.xml
--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/legacypresence/package_definition.xml
--- a/symbian3/mw/legacypresence/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/legacypresence/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/locationsrv/package_definition.xml
--- a/symbian3/mw/locationsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/locationsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/mds/package_definition.xml
--- a/symbian3/mw/mds/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/mds/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/messagingmw/package_definition.xml
--- a/symbian3/mw/messagingmw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/messagingmw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/metadatasrv/package_definition.xml
--- a/symbian3/mw/metadatasrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/mmappfw/package_definition.xml
--- a/symbian3/mw/mmappfw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/mmappfw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/mmmw/package_definition.xml
--- a/symbian3/mw/mmmw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/mmmw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/mmuifw/package_definition.xml
--- a/symbian3/mw/mmuifw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/mmuifw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/netprotocols/package_definition.xml
--- a/symbian3/mw/netprotocols/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/netprotocols/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/phonesrv/package_definition.xml
--- a/symbian3/mw/phonesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/phonesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/platformtools/package_definition.xml
--- a/symbian3/mw/platformtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/platformtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/qt/package_definition.xml
--- a/symbian3/mw/qt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/qt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
@@ -74,6 +74,14 @@
 <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
+<collection name="qt_tests" long-name="Qt Tests" level="app">
+<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
+<unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro" makeArgs="-r"/>
+</component>
+<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
+<unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
+</component>
+</collection>
 </block>
   </layer>
  </systemModel>
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/remoteconn/package_definition.xml
--- a/symbian3/mw/remoteconn/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/remoteconn/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/remotemgmt/package_definition.xml
--- a/symbian3/mw/remotemgmt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/remotestorage/package_definition.xml
--- a/symbian3/mw/remotestorage/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/remotestorage/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/securitysrv/package_definition.xml
--- a/symbian3/mw/securitysrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/securitysrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/serviceapi/package_definition.xml
--- a/symbian3/mw/serviceapi/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/serviceapi/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/serviceapifw/package_definition.xml
--- a/symbian3/mw/serviceapifw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/serviceapifw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/shortlinkconn/package_definition.xml
--- a/symbian3/mw/shortlinkconn/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/srvdiscovery/package_definition.xml
--- a/symbian3/mw/srvdiscovery/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/srvdiscovery/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/svgt/package_definition.xml
--- a/symbian3/mw/svgt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/svgt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/uiaccelerator/package_definition.xml
--- a/symbian3/mw/uiaccelerator/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/uiaccelerator/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/uiresources/package_definition.xml
--- a/symbian3/mw/uiresources/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/uiresources/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
@@ -159,7 +159,7 @@
 <component name="aknskincontent" filter="s60" long-name="Avkon Skin Content" class="config">
 <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
 </component>
-<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme">
+<component name="symbiantheme" filter="sf_build" long-name="Symbian^3 Theme" class="config">
 <unit bldFile="/sf/mw/uiresources/skins/Symbian/group"/>
 </component>
 <component name="aknskins" filter="s60" long-name="Avkon Skin Compiler">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/uitools/package_definition.xml
--- a/symbian3/mw/uitools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/uitools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/usbservices/package_definition.xml
--- a/symbian3/mw/usbservices/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/usbservices/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/videoutils/package_definition.xml
--- a/symbian3/mw/videoutils/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/videoutils/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/vpnclient/package_definition.xml
--- a/symbian3/mw/vpnclient/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/vpnclient/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/web/package_definition.xml
--- a/symbian3/mw/web/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/web/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/websrv/package_definition.xml
--- a/symbian3/mw/websrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/websrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/mw/wirelessacc/package_definition.xml
--- a/symbian3/mw/wirelessacc/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/mw/wirelessacc/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/boardsupport/package_definition.xml
--- a/symbian3/os/boardsupport/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/boardsupport/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/bt/package_definition.xml
--- a/symbian3/os/bt/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/bt/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/buildtools/package_definition.xml
--- a/symbian3/os/buildtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/buildtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/cellularsrv/package_definition.xml
--- a/symbian3/os/cellularsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/cellularsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/commsfw/package_definition.xml
--- a/symbian3/os/commsfw/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/commsfw/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/deviceplatformrelease/package_definition.xml
--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
@@ -139,9 +139,6 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
-</component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
 <collection name="s60bld" long-name="S60 Build">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/devicesrv/package_definition.xml
--- a/symbian3/os/devicesrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/devicesrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/graphics/package_definition.xml
--- a/symbian3/os/graphics/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/graphics/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/imagingext/package_definition.xml
--- a/symbian3/os/imagingext/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/imagingext/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/kernelhwsrv/package_definition.xml
--- a/symbian3/os/kernelhwsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/kernelhwsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/mm/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/networkingsrv/package_definition.xml
--- a/symbian3/os/networkingsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/networkingsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/osrndtools/package_definition.xml
--- a/symbian3/os/osrndtools/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/osrndtools/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/ossrv/package_definition.xml
--- a/symbian3/os/ossrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/ossrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/persistentdata/package_definition.xml
--- a/symbian3/os/persistentdata/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/persistentdata/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/security/package_definition.xml
--- a/symbian3/os/security/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/security/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/textandloc/package_definition.xml
--- a/symbian3/os/textandloc/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/textandloc/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/usb/package_definition.xml
--- a/symbian3/os/usb/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/usb/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/wlan/package_definition.xml
--- a/symbian3/os/wlan/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/wlan/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
diff -r 9e7a463cb657 -r 8a720eca298e symbian3/os/xmlsrv/package_definition.xml
--- a/symbian3/os/xmlsrv/package_definition.xml	Wed Jul 21 16:34:19 2010 +0100
+++ b/symbian3/os/xmlsrv/package_definition.xml	Mon Jul 26 22:03:49 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">