# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1275409654 -3600
# Node ID 96bc1f23ffacd3f47ac2e3cf03ac6082acaf36f1
# Parent  beeef46d1ed8eecb6377515552a0e0414b7c29eb
Update package models from latest system model  (platform@dad7d9368c7c)

diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/adaptation/beagleboard/package_definition.xml
--- a/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/adaptation/beagleboard/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/adaptation/qemu/package_definition.xml
--- a/CompilerCompatibility/adaptation/qemu/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/adaptation/qemu/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/adaptation/stubs/package_definition.xml
--- a/CompilerCompatibility/adaptation/stubs/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/adaptation/stubs/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/camera/package_definition.xml
--- a/CompilerCompatibility/app/camera/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/camera/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="camera" level="apps" long-name="Camera Apps">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/commonemail/package_definition.xml
--- a/CompilerCompatibility/app/commonemail/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/commonemail/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/conntools/package_definition.xml
--- a/CompilerCompatibility/app/conntools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/conntools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/contacts/package_definition.xml
--- a/CompilerCompatibility/app/contacts/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/contacts/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/contentcontrol/package_definition.xml
--- a/CompilerCompatibility/app/contentcontrol/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/contentcontrol/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/conversations/package_definition.xml
--- a/CompilerCompatibility/app/conversations/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/conversations/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/devicecontrol/package_definition.xml
--- a/CompilerCompatibility/app/devicecontrol/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/devicecontrol/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/dictionary/package_definition.xml
--- a/CompilerCompatibility/app/dictionary/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/dictionary/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/files/package_definition.xml
--- a/CompilerCompatibility/app/files/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/files/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/graphicsuis/package_definition.xml
--- a/CompilerCompatibility/app/graphicsuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/graphicsuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/helps/package_definition.xml
--- a/CompilerCompatibility/app/helps/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/helps/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/homescreen/package_definition.xml
--- a/CompilerCompatibility/app/homescreen/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/homescreen/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/homescreentools/package_definition.xml
--- a/CompilerCompatibility/app/homescreentools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/homescreentools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/im/package_definition.xml
--- a/CompilerCompatibility/app/im/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/im/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/imgeditor/package_definition.xml
--- a/CompilerCompatibility/app/imgeditor/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/imgeditor/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/iptelephony/package_definition.xml
--- a/CompilerCompatibility/app/iptelephony/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/iptelephony/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/jrt/package_definition.xml
--- a/CompilerCompatibility/app/jrt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/jrt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/location/package_definition.xml
--- a/CompilerCompatibility/app/location/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/location/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,15 +50,11 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="/sf/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps"/>
 <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
 <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
 <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -150,24 +146,6 @@
 <unit bldFile="/sf/app/location/mapnavproviderrefapp/group"/>
 </component>
 </collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/sf/app/location/locationcentre/group"/>
-</component>
-</collection>
 </block>
 </layer>
 </systemModel>
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/messaging/package_definition.xml
--- a/CompilerCompatibility/app/messaging/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/messaging/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/mmsharinguis/package_definition.xml
--- a/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/musicplayer/package_definition.xml
--- a/CompilerCompatibility/app/musicplayer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/musicplayer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/organizer/package_definition.xml
--- a/CompilerCompatibility/app/organizer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/organizer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/phone/package_definition.xml
--- a/CompilerCompatibility/app/phone/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/phone/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/photos/package_definition.xml
--- a/CompilerCompatibility/app/photos/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/photos/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/podcatcher/package_definition.xml
--- a/CompilerCompatibility/app/podcatcher/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/podcatcher/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/printing/package_definition.xml
--- a/CompilerCompatibility/app/printing/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/printing/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="printing" level="services" long-name="Printing" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/profile/package_definition.xml
--- a/CompilerCompatibility/app/profile/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/profile/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="profile" level="apps" long-name="Profiles" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/radio/package_definition.xml
--- a/CompilerCompatibility/app/radio/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/radio/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/rndtools/package_definition.xml
--- a/CompilerCompatibility/app/rndtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/rndtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -111,9 +111,6 @@
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="/sf/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
 <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
 <!-- can only have a single unit. Should #include from a common bld.inf file -->
 <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/screensaver/package_definition.xml
--- a/CompilerCompatibility/app/screensaver/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/screensaver/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/settingsuis/package_definition.xml
--- a/CompilerCompatibility/app/settingsuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/settingsuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/speechsrv/package_definition.xml
--- a/CompilerCompatibility/app/speechsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/speechsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/techview/package_definition.xml
--- a/CompilerCompatibility/app/techview/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/techview/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/utils/package_definition.xml
--- a/CompilerCompatibility/app/utils/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/utils/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="utils" level="apps" long-name="Utility Apps" levels="app">
@@ -61,9 +61,6 @@
 <component name="calcsoft" filter="s60" long-name="Calculator Application">
 <unit bldFile="/sf/app/utils/extras/calcsoft/group"/>
 </component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="/sf/app/utils/extras/converter/group"/>
-</component>
 </collection>
 </block>
 </layer>
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/videoeditor/package_definition.xml
--- a/CompilerCompatibility/app/videoeditor/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-<?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="app" long-name="Applications" levels="services apps">
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/videoplayer/package_definition.xml
--- a/CompilerCompatibility/app/videoplayer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/videoplayer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/videotelephony/package_definition.xml
--- a/CompilerCompatibility/app/videotelephony/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/videotelephony/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/voicerec/package_definition.xml
--- a/CompilerCompatibility/app/voicerec/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/voicerec/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/app/webuis/package_definition.xml
--- a/CompilerCompatibility/app/webuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/app/webuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/accesssec/package_definition.xml
--- a/CompilerCompatibility/mw/accesssec/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/accesssec/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/appinstall/package_definition.xml
--- a/CompilerCompatibility/mw/appinstall/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/appinstall/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/appsupport/package_definition.xml
--- a/CompilerCompatibility/mw/appsupport/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/appsupport/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/btservices/package_definition.xml
--- a/CompilerCompatibility/mw/btservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/btservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/camerasrv/package_definition.xml
--- a/CompilerCompatibility/mw/camerasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/camerasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/classicui/package_definition.xml
--- a/CompilerCompatibility/mw/classicui/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/classicui/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/dlnasrv/package_definition.xml
--- a/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/dlnasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/drm/package_definition.xml
--- a/CompilerCompatibility/mw/drm/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/drm/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/gsprofilesrv/package_definition.xml
--- a/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/gsprofilesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/hapticsservices/package_definition.xml
--- a/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/hapticsservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/helix/package_definition.xml
--- a/CompilerCompatibility/mw/helix/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/helix/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/homescreensrv/package_definition.xml
--- a/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/homescreensrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/imghandling/package_definition.xml
--- a/CompilerCompatibility/mw/imghandling/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/imghandling/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/imsrv/package_definition.xml
--- a/CompilerCompatibility/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -130,7 +130,7 @@
 <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -153,9 +153,6 @@
 <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/inputmethods/package_definition.xml
--- a/CompilerCompatibility/mw/inputmethods/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/inputmethods/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/ipappprotocols/package_definition.xml
--- a/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/ipappprotocols/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/ipappsrv/package_definition.xml
--- a/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/ipappsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/ipconnmgmt/package_definition.xml
--- a/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/legacypresence/package_definition.xml
--- a/CompilerCompatibility/mw/legacypresence/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/legacypresence/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/locationsrv/package_definition.xml
--- a/CompilerCompatibility/mw/locationsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/locationsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/mds/package_definition.xml
--- a/CompilerCompatibility/mw/mds/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/mds/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/messagingmw/package_definition.xml
--- a/CompilerCompatibility/mw/messagingmw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/messagingmw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/metadatasrv/package_definition.xml
--- a/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/metadatasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/mmappfw/package_definition.xml
--- a/CompilerCompatibility/mw/mmappfw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/mmappfw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/mmmw/package_definition.xml
--- a/CompilerCompatibility/mw/mmmw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/mmmw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/mmuifw/package_definition.xml
--- a/CompilerCompatibility/mw/mmuifw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/mmuifw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/netprotocols/package_definition.xml
--- a/CompilerCompatibility/mw/netprotocols/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/netprotocols/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/opensrv/package_definition.xml
--- a/CompilerCompatibility/mw/opensrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?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="mw" long-name="Middleware" levels="generic specific">
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/phonesrv/package_definition.xml
--- a/CompilerCompatibility/mw/phonesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/phonesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/platformtools/package_definition.xml
--- a/CompilerCompatibility/mw/platformtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/platformtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/qt/package_definition.xml
--- a/CompilerCompatibility/mw/qt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/qt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/remoteconn/package_definition.xml
--- a/CompilerCompatibility/mw/remoteconn/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/remoteconn/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/remotemgmt/package_definition.xml
--- a/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/remotemgmt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/remotestorage/package_definition.xml
--- a/CompilerCompatibility/mw/remotestorage/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/remotestorage/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/securitysrv/package_definition.xml
--- a/CompilerCompatibility/mw/securitysrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/securitysrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/serviceapi/package_definition.xml
--- a/CompilerCompatibility/mw/serviceapi/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapi/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/serviceapifw/package_definition.xml
--- a/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/serviceapifw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/shortlinkconn/package_definition.xml
--- a/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/shortlinkconn/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/srvdiscovery/package_definition.xml
--- a/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/srvdiscovery/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/svgt/package_definition.xml
--- a/CompilerCompatibility/mw/svgt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/svgt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/uiaccelerator/package_definition.xml
--- a/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/uiaccelerator/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/uiresources/package_definition.xml
--- a/CompilerCompatibility/mw/uiresources/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/uiresources/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/uitools/package_definition.xml
--- a/CompilerCompatibility/mw/uitools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/uitools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/usbservices/package_definition.xml
--- a/CompilerCompatibility/mw/usbservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/usbservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/videoutils/package_definition.xml
--- a/CompilerCompatibility/mw/videoutils/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/videoutils/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/vpnclient/package_definition.xml
--- a/CompilerCompatibility/mw/vpnclient/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/vpnclient/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/web/package_definition.xml
--- a/CompilerCompatibility/mw/web/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/web/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/websrv/package_definition.xml
--- a/CompilerCompatibility/mw/websrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/websrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/mw/wirelessacc/package_definition.xml
--- a/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/mw/wirelessacc/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/boardsupport/package_definition.xml
--- a/CompilerCompatibility/os/boardsupport/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/boardsupport/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/bt/package_definition.xml
--- a/CompilerCompatibility/os/bt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/bt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/buildtools/package_definition.xml
--- a/CompilerCompatibility/os/buildtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/buildtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/cellularsrv/package_definition.xml
--- a/CompilerCompatibility/os/cellularsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/cellularsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -127,9 +127,6 @@
 <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
 </component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
 <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
 </component>
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/commsfw/package_definition.xml
--- a/CompilerCompatibility/os/commsfw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/commsfw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/deviceplatformrelease/package_definition.xml
--- a/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/devicesrv/package_definition.xml
--- a/CompilerCompatibility/os/devicesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/devicesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/graphics/package_definition.xml
--- a/CompilerCompatibility/os/graphics/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/graphics/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/imagingext/package_definition.xml
--- a/CompilerCompatibility/os/imagingext/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/imagingext/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -78,6 +78,9 @@
 <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
 <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
 </collection>
 <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
 <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/kernelhwsrv/package_definition.xml
--- a/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/mm/package_definition.xml
--- a/CompilerCompatibility/os/mm/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/mm/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/networkingsrv/package_definition.xml
--- a/CompilerCompatibility/os/networkingsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/networkingsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -161,12 +161,6 @@
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
 <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
 </component>
-<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
diff -r beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/osrndtools/package_definition.xml
--- a/CompilerCompatibility/os/osrndtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/osrndtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/ossrv/package_definition.xml
--- a/CompilerCompatibility/os/ossrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/ossrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/persistentdata/package_definition.xml
--- a/CompilerCompatibility/os/persistentdata/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/persistentdata/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/security/package_definition.xml
--- a/CompilerCompatibility/os/security/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/security/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/textandloc/package_definition.xml
--- a/CompilerCompatibility/os/textandloc/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/textandloc/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/usb/package_definition.xml
--- a/CompilerCompatibility/os/usb/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/usb/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/wlan/package_definition.xml
--- a/CompilerCompatibility/os/wlan/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/wlan/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac CompilerCompatibility/os/xmlsrv/package_definition.xml
--- a/CompilerCompatibility/os/xmlsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/CompilerCompatibility/os/xmlsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/adaptation/beagleboard/package_definition.xml
--- a/symbian3/adaptation/beagleboard/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/adaptation/beagleboard/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/adaptation/qemu/package_definition.xml
--- a/symbian3/adaptation/qemu/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/adaptation/qemu/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/adaptation/stubs/package_definition.xml
--- a/symbian3/adaptation/stubs/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/adaptation/stubs/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/camera/package_definition.xml
--- a/symbian3/app/camera/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/camera/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="camera" level="apps" long-name="Camera Apps">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/commonemail/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/conntools/package_definition.xml
--- a/symbian3/app/conntools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/conntools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/contacts/package_definition.xml
--- a/symbian3/app/contacts/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/contacts/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/contentcontrol/package_definition.xml
--- a/symbian3/app/contentcontrol/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/contentcontrol/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/conversations/package_definition.xml
--- a/symbian3/app/conversations/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/conversations/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/devicecontrol/package_definition.xml
--- a/symbian3/app/devicecontrol/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/devicecontrol/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/dictionary/package_definition.xml
--- a/symbian3/app/dictionary/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/dictionary/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/files/package_definition.xml
--- a/symbian3/app/files/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/files/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/graphicsuis/package_definition.xml
--- a/symbian3/app/graphicsuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/graphicsuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/helps/package_definition.xml
--- a/symbian3/app/helps/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/helps/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/homescreen/package_definition.xml
--- a/symbian3/app/homescreen/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/homescreen/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/homescreentools/package_definition.xml
--- a/symbian3/app/homescreentools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/homescreentools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/im/package_definition.xml
--- a/symbian3/app/im/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/im/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/imgeditor/package_definition.xml
--- a/symbian3/app/imgeditor/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/imgeditor/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/iptelephony/package_definition.xml
--- a/symbian3/app/iptelephony/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/iptelephony/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/jrt/package_definition.xml
--- a/symbian3/app/jrt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/jrt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/location/package_definition.xml
--- a/symbian3/app/location/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/location/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,15 +50,11 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="/sf/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps"/>
 <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
 <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
 <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -150,24 +146,6 @@
 <unit bldFile="/sf/app/location/mapnavproviderrefapp/group"/>
 </component>
 </collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/sf/app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/sf/app/location/locationcentre/group"/>
-</component>
-</collection>
 </block>
 </layer>
 </systemModel>
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/messaging/package_definition.xml
--- a/symbian3/app/messaging/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/messaging/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/mmsharinguis/package_definition.xml
--- a/symbian3/app/mmsharinguis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/musicplayer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/organizer/package_definition.xml
--- a/symbian3/app/organizer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/organizer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/phone/package_definition.xml
--- a/symbian3/app/phone/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/phone/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/photos/package_definition.xml
--- a/symbian3/app/photos/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/photos/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/podcatcher/package_definition.xml
--- a/symbian3/app/podcatcher/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/podcatcher/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="podcatcher" level="apps" long-name="Podcatcher" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/printing/package_definition.xml
--- a/symbian3/app/printing/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/printing/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="printing" level="services" long-name="Printing" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/profile/package_definition.xml
--- a/symbian3/app/profile/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/profile/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="profile" level="apps" long-name="Profiles" levels="app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/radio/package_definition.xml
--- a/symbian3/app/radio/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/radio/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/rndtools/package_definition.xml
--- a/symbian3/app/rndtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/rndtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -111,9 +111,6 @@
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="/sf/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
 <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
 <!-- can only have a single unit. Should #include from a common bld.inf file -->
 <unit bldFile="/sf/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/screensaver/package_definition.xml
--- a/symbian3/app/screensaver/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/screensaver/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/settingsuis/package_definition.xml
--- a/symbian3/app/settingsuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/settingsuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/speechsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/techview/package_definition.xml
--- a/symbian3/app/techview/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/techview/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/utils/package_definition.xml
--- a/symbian3/app/utils/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/utils/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="utils" level="apps" long-name="Utility Apps" levels="app">
@@ -61,9 +61,6 @@
 <component name="calcsoft" filter="s60" long-name="Calculator Application">
 <unit bldFile="/sf/app/utils/extras/calcsoft/group"/>
 </component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="/sf/app/utils/extras/converter/group"/>
-</component>
 </collection>
 </block>
 </layer>
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/videoeditor/package_definition.xml
--- a/symbian3/app/videoeditor/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-<?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="app" long-name="Applications" levels="services apps">
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="/sf/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/videoplayer/package_definition.xml
--- a/symbian3/app/videoplayer/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/videoplayer/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/videotelephony/package_definition.xml
--- a/symbian3/app/videotelephony/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/videotelephony/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/app/voicerec/package_definition.xml
--- a/symbian3/app/voicerec/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/voicerec/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/app/webuis/package_definition.xml
--- a/symbian3/app/webuis/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/app/webuis/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="webuis" level="services" long-name="Web UIs" levels="plugin app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/accesssec/package_definition.xml
--- a/symbian3/mw/accesssec/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/accesssec/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/appinstall/package_definition.xml
--- a/symbian3/mw/appinstall/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/appinstall/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/appsupport/package_definition.xml
--- a/symbian3/mw/appsupport/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/appsupport/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/btservices/package_definition.xml
--- a/symbian3/mw/btservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/btservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/camerasrv/package_definition.xml
--- a/symbian3/mw/camerasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/camerasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/classicui/package_definition.xml
--- a/symbian3/mw/classicui/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/classicui/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/dlnasrv/package_definition.xml
--- a/symbian3/mw/dlnasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/drm/package_definition.xml
--- a/symbian3/mw/drm/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/drm/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/gsprofilesrv/package_definition.xml
--- a/symbian3/mw/gsprofilesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/gsprofilesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/hapticsservices/package_definition.xml
--- a/symbian3/mw/hapticsservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/hapticsservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/helix/package_definition.xml
--- a/symbian3/mw/helix/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/helix/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/homescreensrv/package_definition.xml
--- a/symbian3/mw/homescreensrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/homescreensrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/imghandling/package_definition.xml
--- a/symbian3/mw/imghandling/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/imghandling/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/imsrv/package_definition.xml
--- a/symbian3/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -130,7 +130,7 @@
 <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -153,9 +153,6 @@
 <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/inputmethods/package_definition.xml
--- a/symbian3/mw/inputmethods/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/inputmethods/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/ipappprotocols/package_definition.xml
--- a/symbian3/mw/ipappprotocols/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/ipappprotocols/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/ipappsrv/package_definition.xml
--- a/symbian3/mw/ipappsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/ipappsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/ipconnmgmt/package_definition.xml
--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/legacypresence/package_definition.xml
--- a/symbian3/mw/legacypresence/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/legacypresence/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/locationsrv/package_definition.xml
--- a/symbian3/mw/locationsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/locationsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/mds/package_definition.xml
--- a/symbian3/mw/mds/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/mds/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/messagingmw/package_definition.xml
--- a/symbian3/mw/messagingmw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/messagingmw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/metadatasrv/package_definition.xml
--- a/symbian3/mw/metadatasrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/mmappfw/package_definition.xml
--- a/symbian3/mw/mmappfw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/mmappfw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/mmmw/package_definition.xml
--- a/symbian3/mw/mmmw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/mmmw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/mmuifw/package_definition.xml
--- a/symbian3/mw/mmuifw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/mmuifw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/netprotocols/package_definition.xml
--- a/symbian3/mw/netprotocols/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/netprotocols/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/opensrv/package_definition.xml
--- a/symbian3/mw/opensrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-<?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="mw" long-name="Middleware" levels="generic specific">
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/phonesrv/package_definition.xml
--- a/symbian3/mw/phonesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/phonesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/platformtools/package_definition.xml
--- a/symbian3/mw/platformtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/platformtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="platformtools" level="generic" long-name="Platform Tools">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/qt/package_definition.xml
--- a/symbian3/mw/qt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/qt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/remoteconn/package_definition.xml
--- a/symbian3/mw/remoteconn/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/remoteconn/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/remotemgmt/package_definition.xml
--- a/symbian3/mw/remotemgmt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/remotestorage/package_definition.xml
--- a/symbian3/mw/remotestorage/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/remotestorage/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/securitysrv/package_definition.xml
--- a/symbian3/mw/securitysrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/securitysrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/serviceapi/package_definition.xml
--- a/symbian3/mw/serviceapi/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/serviceapi/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/serviceapifw/package_definition.xml
--- a/symbian3/mw/serviceapifw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/serviceapifw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/shortlinkconn/package_definition.xml
--- a/symbian3/mw/shortlinkconn/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/srvdiscovery/package_definition.xml
--- a/symbian3/mw/srvdiscovery/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/srvdiscovery/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/svgt/package_definition.xml
--- a/symbian3/mw/svgt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/svgt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/uiaccelerator/package_definition.xml
--- a/symbian3/mw/uiaccelerator/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/uiaccelerator/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/uiresources/package_definition.xml
--- a/symbian3/mw/uiresources/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/uiresources/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/uitools/package_definition.xml
--- a/symbian3/mw/uitools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/uitools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/usbservices/package_definition.xml
--- a/symbian3/mw/usbservices/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/usbservices/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/videoutils/package_definition.xml
--- a/symbian3/mw/videoutils/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/videoutils/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/vpnclient/package_definition.xml
--- a/symbian3/mw/vpnclient/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/vpnclient/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/web/package_definition.xml
--- a/symbian3/mw/web/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/web/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/websrv/package_definition.xml
--- a/symbian3/mw/websrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/websrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/mw/wirelessacc/package_definition.xml
--- a/symbian3/mw/wirelessacc/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/wirelessacc/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/boardsupport/package_definition.xml
--- a/symbian3/os/boardsupport/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/boardsupport/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/bt/package_definition.xml
--- a/symbian3/os/bt/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/bt/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/buildtools/package_definition.xml
--- a/symbian3/os/buildtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/buildtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/cellularsrv/package_definition.xml
--- a/symbian3/os/cellularsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/cellularsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -127,9 +127,6 @@
 <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
 </component>
-<component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y">
-<unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-</component>
 <component name="ctsydispatchlayer" long-name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
 </component>
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/os/commsfw/package_definition.xml
--- a/symbian3/os/commsfw/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/commsfw/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/deviceplatformrelease/package_definition.xml
--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="deviceplatformrelease" level="services" long-name="Device Platform Release" levels="bld mid top">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/os/devicesrv/package_definition.xml
--- a/symbian3/os/devicesrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/devicesrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/graphics/package_definition.xml
--- a/symbian3/os/graphics/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/graphics/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/imagingext/package_definition.xml
--- a/symbian3/os/imagingext/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/imagingext/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -78,6 +78,9 @@
 <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
 <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" class="api">
+<unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
 </collection>
 <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
 <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/os/kernelhwsrv/package_definition.xml
--- a/symbian3/os/kernelhwsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/kernelhwsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/mm/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/networkingsrv/package_definition.xml
--- a/symbian3/os/networkingsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/networkingsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">
@@ -161,12 +161,6 @@
 <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development">
 <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
 </component>
-<component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-</component>
-<component name="networkingperformancemeasurementtools" long-name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
-<unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
-</component>
 </collection>
 <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
 <component name="networkingrom" long-name="Networking ROM" purpose="mandatory">
diff -r beeef46d1ed8 -r 96bc1f23ffac symbian3/os/osrndtools/package_definition.xml
--- a/symbian3/os/osrndtools/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/osrndtools/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/ossrv/package_definition.xml
--- a/symbian3/os/ossrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/ossrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/persistentdata/package_definition.xml
--- a/symbian3/os/persistentdata/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/persistentdata/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/security/package_definition.xml
--- a/symbian3/os/security/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/security/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/textandloc/package_definition.xml
--- a/symbian3/os/textandloc/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/textandloc/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/usb/package_definition.xml
--- a/symbian3/os/usb/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/usb/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/wlan/package_definition.xml
--- a/symbian3/os/wlan/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/wlan/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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 beeef46d1ed8 -r 96bc1f23ffac symbian3/os/xmlsrv/package_definition.xml
--- a/symbian3/os/xmlsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/os/xmlsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <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">