FCL/sftools/fbf/projects/packages: changeset 43:35cc8ff825d7

--- a/symbian3/mw/accesssec/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,109 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="accesssec">
-<collection name="s60">
-<component name="accesssec">
-<unit bldFile="/sf/mw/accesssec/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+        <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
+          <component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
+            <!-- the directory for this needs to be moved up to the right level -->
+            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+          </component>
+          <component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
+            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+          </component>
+          <component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
+            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+          </component>
+          <component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
+            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+          </component>
+          <component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
+            <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+          </component>
+        </collection>
+        <collection name="eapol" long-name="EAPOL" level="framework">
+          <component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
+            <unit bldFile="/sf/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+          </component>
+        </collection>
+        <collection name="accesssec_info" long-name="Access Security Info" level="specific">
+          <component name="accesssec_plat" filter="s60" long-name="Access Security Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/accesssec/accesssec_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/accesssec/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
+    <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
+      <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+        <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+      </component>
+      <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
+        <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
+      </component>
+      <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
+        <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
+      </component>
+      <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
+        <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
+      </component>
+      <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
+        <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
+      </component>
+    </collection>
+    <collection id="eapol" name="EAPOL" level="framework">
+      <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+        <unit bldFile="eapol/eapol_framework/eapol_symbian/group"/>
+      </component>
+    </collection>
+    <collection id="accesssec_info" name="Access Security Info" level="specific">
+      <component id="accesssec_plat" filter="s60" name="Access Security Platform Interfaces" class="api">
+        <unit bldFile="accesssec_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/appinstall/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,142 +1,163 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="appinstall">
-<unit bldFile="/sf/mw/appinstall/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+        <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
+          <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+          <component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
+            <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
+          </component>
+          <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
+            <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+          </component>
+          <component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+            <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+          </component>
+        </collection>
+        <collection name="appinstaller" long-name="Application Installer" level="generic">
+          <component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/appinstaller/appmngr2/group"/>
+          </component>
+          <component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
+          </component>
+        </collection>
+        <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+          <!-- the collection is really a component. Move down a directory.-->
+          <component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
+          </component>
+        </collection>
+        <collection name="iaupdate" long-name="Independent Apps Update" level="api">
+          <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+          <component name="iad" long-name="Software Update" filter="s60" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/iaupdate/iad/group"/>
+          </component>
+          <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
+          </component>
+          <component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+            <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+          </component>
+        </collection>
+        <collection name="installationservices" long-name="Installation Services" level="generic">
+          <component name="swi" long-name="Secure Software Install" purpose="optional">
+            <unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+          </component>
+          <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+            <unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+          </component>
+          <component name="switestfw" long-name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+            <unit mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp" bldFile="/sf/mw/appinstall/installationservices/switestfw/group"/>
+          </component>
+          <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+            <unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+          </component>
+        </collection>
+        <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+          <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+            <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+          </component>
+          <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
+            <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+          </component>
+          <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
+            <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+          </component>
+          <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+            <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+          </component>
+        </collection>
+        <collection name="appinstall_info" long-name="Application Installation Info" level="api">
+          <component name="appinstall_pub" filter="s60" long-name="Application Installation Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/appinstall/appinstall_pub/group"/>
+          </component>
+          <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
+          </component>
+          <component name="appinstall_test" filter="s60,api_test" long-name="Application Installation Test" purpose="development">
+            <unit bldFile="/sf/mw/appinstall/tsrc/group"/>
+          </component>
+          <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/appinstall/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="appinstall" name="Application Installation" levels="tool framework generic api">
+    <collection id="appinstaller" name="Application Installer" level="generic">
+      <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
+        <unit bldFile="appinstaller/appmngr2/group"/>
+      </component>
+      <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+        <unit bldFile="appinstaller/appinstui/group"/>
+      </component>
+    </collection>
+    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
+      <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+        <unit bldFile="ncdengine/engine/group"/>
+      </component>
+      <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+        <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+      </component>
+      <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+        <unit bldFile="ncdengine/group"/>
+      </component>
+    </collection>
+    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+      <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+        <unit bldFile="iaupdateapi_stub/group"/>
+      </component>
+    </collection>
+    <collection id="iaupdate" name="Independent Apps Update" level="api">
+      <component id="iad" name="Software Update" filter="s60" introduced="^2">
+        <unit bldFile="iaupdate/iad/group"/>
+      </component>
+      <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+        <unit bldFile="iaupdate/help/group"/>
+      </component>
+      <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+        <unit bldFile="iaupdate/group"/>
+      </component>
+    </collection>
+    <collection id="installationservices" name="Installation Services" level="generic">
+      <component id="swi" name="Secure Software Install" purpose="optional">
+        <unit bldFile="installationservices/swi/group" mrp="installationservices/swi/group/security_swi.mrp"/>
+      </component>
+      <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+        <unit bldFile="installationservices/swidevicetools/group" mrp="installationservices/swidevicetools/group/security_switools_device.mrp"/>
+      </component>
+      <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="installationservices/switestfw/group/install_testframework.mrp" bldFile="installationservices/switestfw/group"/>
+      </component>
+      <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+        <unit bldFile="installationservices/swiconfig/group" mrp="installationservices/swiconfig/group/install_config.mrp"/>
+      </component>
+    </collection>
+    <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+      <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+        <unit bldFile="secureswitools/makekeys/group" mrp="secureswitools/makekeys/group/security_makekeys.mrp"/>
+      </component>
+      <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+        <unit bldFile="secureswitools/swianalysistoolkit/group" mrp="secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+      </component>
+      <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+        <unit mrp="secureswitools/openssllib/security_openssl.mrp"/>
+      </component>
+      <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+        <unit bldFile="secureswitools/swisistools/group" mrp="secureswitools/swisistools/group/security_sistools.mrp"/>
+      </component>
+    </collection>
+    <collection id="appinstall_info" name="Application Installation Info" level="api">
+      <component id="appinstall_pub" filter="s60" name="Application Installation Public Interfaces" class="api">
+        <unit bldFile="appinstall_pub/group"/>
+        <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+        <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+      </component>
+      <component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
+        <unit bldFile="appinstall_plat/group"/>
+        <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+        <!-- <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
+      </component>
+      <component id="appinstall_test" filter="s60" name="Application Installation Test" purpose="development">
+        <!-- <unit bldFile="tsrc/group"/> -->
+      </component>
+      <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/appsupport/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,219 +1,270 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
-<collection name="filehandling" long-name="File Handling" level="server">
-<component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-</component>
-<component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-</component>
-<component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-</component>
-</collection>
-<collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-<component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-</component>
-</collection>
-<collection name="commonappservices" long-name="Common Application Services" level="framework">
-<component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
-</component>
-<component name="alarmservertest" long-name="Alarm Server Test" deprecated="tb92" introduced="8.1" purpose="development">
-<unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-</component>
-<component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development">
-<unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp"/>
-</component>
-<component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
-<unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-</component>
-<component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/sf/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-</component>
-</collection>
-<collection name="tzservices" long-name="Time Zone Services" level="plugin">
-<component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-</component>
-<component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-</component>
-<component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-</component>
-<component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/tzservices/worldserver/group" mrp="/sf/mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
-</component>
-<component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development">
-<unit bldFile="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
-</collection>
-<collection name="contenthandling" long-name="Content Handling" level="plugin">
-<component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-</component>
-</collection>
-<collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
-<component name="commandshell" long-name="Command Shell" introduced="tb92" purpose="development">
-<unit bldFile="/sf/mw/appsupport/openenvutils/commandshell/group" mrp="/sf/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
-</component>
-<component name="telnetserver" long-name="Telnet Server" introduced="tb92" purpose="development">
-<unit bldFile="/sf/mw/appsupport/openenvutils/telnetserver/group" mrp="/sf/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-</component>
-</collection>
-<collection name="printingsupport" long-name="Printing Support" level="generic">
-<component name="printinguisupport" long-name="Printing UI Support" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-</component>
-</collection>
-<collection name="appfw" long-name="Application Framework" level="framework">
-<component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
-<unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-</component>
-<component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-</component>
-<component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development">
-<unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
-</component>
-</collection>
-<collection name="applaunchservices" long-name="Application Launch Services" level="generic">
-<component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-</component>
-<component name="applaunchplugins" long-name="Application Launch Plugins" introduced="tb92" purpose="optional">
-<unit bldFile="/sf/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/sf/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-</component>
-</collection>
-<collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-<component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" START REMOVE -->
-<component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/worlddatabasekit/group" mrp="/sf/mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
-</component>
-<component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" purpose="development" class="config PC">
-<unit bldFile="/sf/mw/appsupport/tzpcside/worldtools/group" mrp="/sf/mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
-</component>
-<!--PLACEHOLDER="DS.1802" END REMOVE -->
-</collection>
-<collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="appsupport">
-<unit bldFile="/sf/mw/appsupport/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+        <collection name="contextframework" long-name="Context Framework" level="framework">
+          <component name="cfw" filter="s60" long-name="Context Framework">
+            <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
+          </component>
+          <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
+          </component>
+        </collection>
+        <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
+          <component name="dbrecovery" filter="s60" long-name="Database Recovery">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+          </component>
+          <component name="nspswsplugin" filter="s60" long-name="NSPS WS Plugin" plugin="Y">
+            <!-- No Service Power Save? Window Server? Please elaborate-->
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+          </component>
+          <component name="rfs" filter="s60" long-name="Restore Factory Settings">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
+          </component>
+          <component name="rfsplugins" filter="s60" long-name="Restore Factory Settings Plugins" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+          </component>
+          <component name="sysap" filter="s60" long-name="System Application">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
+          </component>
+          <component name="variatedsettings" filter="s60" long-name="Variated Settings" class="config">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+          </component>
+          <component name="accfwuinotifier" filter="s60" long-name="Accessory Framework UI Notifier" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+          </component>
+          <component name="kefmapper" filter="s60" long-name="Key Event Framework">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+          </component>
+          <component name="advancedtspcontroller" filter="s60" long-name="Advanced TSP Controller">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+          </component>
+          <component name="powersaveutilities" filter="s60" long-name="Power Save Utilities">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+          </component>
+          <component name="gsserverenginestub" filter="s60" long-name="GS Server Engine Stub">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+          </component>
+          <component name="gsserverengine" filter="s60" long-name="GS Server Engine">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+          </component>
+          <component name="sensordatacompensatorplugin" filter="s60" long-name="Sensor Data Compensator Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+          </component>
+        </collection>
+        <collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
+          <!--  collection is really a component. Move down a directory -->
+          <component name="flashliteapi_3_1_build" long-name="Flash Lite API Build" filter="s60" introduced="^2"/>
+        </collection>
+        <collection name="mediakeys" long-name="Media Keys" level="plugin">
+          <!--  collection is really a component. Move down a directory -->
+          <component name="mediakeys_build" filter="s60" long-name="Media Keys Build">
+            <unit bldFile="/sf/mw/appsupport/mediakeys/group"/>
+          </component>
+        </collection>
+        <collection name="startupservices" long-name="Startup Services" level="system">
+          <component name="splashscreen" filter="s60" long-name="Splash Screen">
+            <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
+          </component>
+          <component name="startupanimation" filter="s60" long-name="Startup Animation">
+            <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
+          </component>
+          <component name="startup" long-name="Startup Application" filter="s60">
+            <unit bldFile="/sf/mw/appsupport/startupservices/startup/group"/>
+          </component>
+        </collection>
+        <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
+          <component name="oodmonitor" filter="s60" long-name="OOD Monitor" introduced="7.0s">
+            <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+          </component>
+          <component name="oommonitor" filter="s60" long-name="OOM Monitor" introduced="7.0s">
+            <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+          </component>
+        </collection>
+        <collection name="systemsettings" long-name="System Settings" level="system">
+          <component name="gssensorplugin" filter="s60" long-name="GS Sensor Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
+          </component>
+          <component name="gsaccessoryplugin" filter="s60" long-name="GS Accessory Plugin" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+          </component>
+        </collection>
+        <collection name="filehandling" long-name="File Handling" level="server">
+          <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+          </component>
+          <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+          </component>
+          <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+          </component>
+        </collection>
+        <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+          <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+          </component>
+        </collection>
+        <collection name="commonappservices" long-name="Common Application Services" level="framework">
+          <component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+          </component>
+          <component name="alarmservertest" long-name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+          </component>
+          <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+            <unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="/sf/mw/appsupport/commonappservices/coreappstest/Group"/>
+          </component>
+          <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc">
+            <unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+          </component>
+          <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/sf/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+          </component>
+        </collection>
+        <collection name="tzservices" long-name="Time Zone Services" level="plugin">
+          <component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+          </component>
+          <component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+          </component>
+          <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+          </component>
+          <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+            <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+          </component>
+        </collection>
+        <collection name="contenthandling" long-name="Content Handling" level="plugin">
+          <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+          </component>
+        </collection>
+        <collection name="openenvutils" long-name="Open Environment Utilities" level="specific">
+          <component name="commandshell" long-name="Command Shell" introduced="^3" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/openenvutils/commandshell/group" mrp="/sf/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+          </component>
+          <component name="telnetserver" long-name="Telnet Server" introduced="^3" purpose="development">
+            <unit bldFile="/sf/mw/appsupport/openenvutils/telnetserver/group" mrp="/sf/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+          </component>
+        </collection>
+        <collection name="printingsupport" long-name="Printing Support" level="generic">
+          <component name="printinguisupport" long-name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+            <unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+          </component>
+        </collection>
+        <collection name="appfw" long-name="Application Framework" level="framework">
+          <component name="apparchitecture" long-name="Application Architecture" purpose="mandatory">
+            <unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+          </component>
+          <component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory">
+            <unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+          </component>
+          <component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+            <unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="/sf/mw/appsupport/appfw/uiftestfw/group"/>
+          </component>
+        </collection>
+        <collection name="applaunchservices" long-name="Application Launch Services" level="generic">
+          <component name="aftermarketappstarter" long-name="After Market Application Starter" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/sf/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+          </component>
+          <component name="applaunchplugins" long-name="Application Launch Plugins" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/sf/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+          </component>
+        </collection>
+        <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
+          <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC">
+            <unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+          </component>
+        </collection>
+        <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+          <component name="appsupport_plat" filter="s60" long-name="Generic Application Support Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_plat/group"/>
+          </component>
+          <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/appsupport/appsupport_pub/group"/>
+          </component>
+          <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/appsupport/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
+    <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+      <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+        <unit bldFile="sysresmonitoring/oodmonitor/group"/>
+      </component>
+      <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+        <unit bldFile="sysresmonitoring/oommonitor/group"/>
+        <!-- <unit bldFile="sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
+      </component>
+    </collection>
+    <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+      <component id="viewerfw" name="Flash Viewer Framework" filter="s60" class="api" introduced="^2">
+        <!--no real bld.inf --> 
+        <unit base="flashliteapi_3_1/viewerfw"/>
+      </component>
+    </collection>
+    <collection id="contextframework" name="Context Framework" level="framework">
+      <component id="cfw" filter="s60" name="Context Framework">
+        <unit bldFile="contextframework/cfw/group"/>
+        <!-- <unit bldFile="contextframework/cfw/tsrc/cfwtest/group"/> -->
+        <!-- <unit bldFile="contextframework/cfw/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+        <unit bldFile="contextframework/cfwplugins/group"/>
+      </component>
+      <component id="contextframework_build" filter="s60" name="Context Framework Build">
+        <unit bldFile="contextframework/group"/>
+      </component>
+    </collection>
+    <collection id="mediakeys" name="Media Keys" level="plugin">
+      <component id="keypublisherplugin" filter="s60" name="Key Publisher Plugin" class="plugin">
+        <!-- <unit bldFile="mediakeys/keypublisherplugin/group"/> -->
+      </component>
+      <component id="mmkeybearer" filter="s60" name="MM Key Bearer" class="plugin">
+        <!-- <unit bldFile="mediakeys/mmkeybearer/group"/> -->
+      </component>
+      <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+        <unit bldFile="mediakeys/group"/>
+      </component>
+    </collection>
+    <collection id="coreapplicationuis" name="Core Application UIs" level="server">
+      <component id="dbrecovery" filter="s60" name="Database Recovery">
+        <unit bldFile="coreapplicationuis/dbrecovery/group"/>
+      </component>
+      <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+          <!-- No Service Power Save? Window Server?-->
+        <unit bldFile="coreapplicationuis/nspswsplugin/group"/>
+      </component>
+      <component id="rfs" filter="s60" name="Restore Factory Settings">
+        <unit bldFile="coreapplicationuis/rfs/group"/>
+        <!-- <unit bldFile="coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
+      </component>
+      <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+        <unit bldFile="coreapplicationuis/rfsplugins/group"/>
+        <!-- <unit bldFile="coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
+        <!-- <unit bldFile="coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
+      </component>
+      <component id="sysap" filter="s60" name="System Application">
+        <unit bldFile="coreapplicationuis/sysap/group"/>
+      </component>
+      <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+        <unit bldFile="coreapplicationuis/variatedsettings/group"/>
+      </component>
+      <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+        <unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
+      </component>
+      <component id="kefmapper" filter="s60" name="Key Event Framework">
+        <unit bldFile="coreapplicationuis/kefmapper/group"/>
+      </component>
+      <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+        <unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
+        <!-- <unit bldFile="coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
+        <!-- <unit bldFile="coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
+      </component>
+      <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+        <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
+        <!-- <unit bldFile="coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="gsserver" filter="s60" name="General Settings Server">
+        <unit bldFile="coreapplicationuis/gsserver/group"/>
+      </component>
+      <component id="gsserverengine" filter="s60" name="GS Server Engine">
+        <unit bldFile="coreapplicationuis/gsserverengine/group"/>
+      </component>
+      <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
+        <unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
+      </component>
+      <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+        <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
+        <!-- <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
+        <!-- <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
+      </component>
+      <component id="coreapplicationuis_test" filter="s60" name="Core Application UIs Test" purpose="development">
+        <!-- <unit bldFile="coreapplicationuis/tsrc/public/basic/group"/> -->
+      </component>
+    </collection>
+    <collection id="startupservices" name="Startup Services" level="system">
+      <component id="startup" name="Startup Application" filter="s60">
+        <unit bldFile="startupservices/startup/group"/>
+        <!-- <unit bldFile="startupservices/startup/mediatorplugin/group"/> -->
+        <!-- <unit bldFile="startupservices/startup/startupsyncplugin/group"/> -->
+        <!-- <unit bldFile="startupservices/startup/systemerrorplugin/group"/> -->
+      </component>
+      <component id="splashscreen" filter="s60" name="Splash Screen">
+        <unit bldFile="startupservices/splashscreen/group"/>
+      </component>
+      <component id="startupanimation" filter="s60" name="Startup Animation">
+        <unit bldFile="startupservices/startupanimation/group"/>
+      </component>
+    </collection>
+    <collection id="systemsettings" name="System Settings" level="system">
+      <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+        <unit bldFile="systemsettings/gssensorplugin/group"/>
+      </component>
+      <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+        <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
+      </component>
+    </collection>
+    <collection id="filehandling" name="File Handling" level="server">
+      <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+        <unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+      </component>
+      <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+        <unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+      </component>
+      <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+      </component>
+    </collection>
+	<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+      <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
+        <unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+      </component>
+    </collection>
+    <collection id="commonappservices" name="Common Application Services" level="framework">
+      <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
+        <unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+      </component>
+      <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+        <unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+      </component>
+      <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+        <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
+      </component>
+      <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+        <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+      </component>
+      <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+        <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+      </component>
+    </collection>
+    <collection id="tzservices" name="Time Zone Services" level="plugin">
+      <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+        <unit bldFile="tzservices/tzserver/group" mrp="tzservices/tzserver/group/app-services_tz.mrp"/>
+      </component>
+      <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+        <unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+      </component>
+      <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+        <unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+      </component>
+      <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+        <unit bldFile="tzservices/tzdatabase/group" mrp="tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+      </component>
+    </collection>
+    <collection id="contenthandling" name="Content Handling" level="plugin">
+      <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+        <unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+      </component>
+    </collection>
+    <collection id="openenvutils" name="Open Environment Utilities" level="specific">
+      <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+        <unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
+      </component>
+      <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+        <unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+      </component>
+    </collection>
+    <collection id="printingsupport" name="Printing Support" level="generic">
+      <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+        <unit bldFile="printingsupport/printinguisupport/group" mrp="printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+      </component>
+    </collection>
+    <collection id="appfw" name="Application Framework" level="framework">
+      <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+        <unit bldFile="appfw/apparchitecture/group" mrp="appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+      </component>
+      <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+        <unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+      </component>
+      <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+        <unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
+      </component>
+    </collection>
+    <collection id="applaunchservices" name="Application Launch Services" level="generic">
+      <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+        <unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+      </component>
+      <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+        <unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+      </component>
+    </collection>
+    <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+      <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+        <unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+      </component>
+    </collection>
+    <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+      <component id="appsupport_plat" filter="s60" name="Generic Application Support Platform Interfaces" class="api">
+        <unit bldFile="appsupport_plat/group"/>
+      </component>
+      <component id="appsupport_pub" filter="s60" name="Generic Application Support Public Interfaces" class="api">
+        <unit bldFile="appsupport_pub/group"/>
+        <!-- <unit bldFile="appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
+        <!-- <unit bldFile="appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
+      </component>
+      <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/btservices/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/btservices/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,119 +1,137 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
-<collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-<component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/btservices/bluetoothappprofiles/avrcp" mrp="/sf/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-</component>
-</collection>
-<collection name="btservices_info" long-name="BT Services Info" level="plugin">
-<component name="btservices_metadata" long-name="BT Services Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="btservices">
-<unit bldFile="/sf/mw/btservices/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+        <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+          <component name="bteng" filter="s60" long-name="Bluetooth Engine">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/bteng/group"/>
+          </component>
+          <component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btnotif/group"/>
+          </component>
+          <component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudioman/group"/>
+          </component>
+          <component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btmac/group"/>
+          </component>
+          <component name="btsac" filter="s60" long-name="Bluetooth Stereo Audio Controller" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btsac/group"/>
+          </component>
+          <component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+          </component>
+          <component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btsap/group"/>
+          </component>
+          <component name="btui" filter="s60" long-name="Bluetooth UI">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btui/group"/>
+          </component>
+          <component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/btpbap/group"/>
+          </component>
+          <component name="bthid" filter="s60" long-name="Bluetooth HID">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/bthid/group"/>
+          </component>
+          <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/bluetoothengine/bthid/group"/>
+          </component>
+        </collection>
+        <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+          <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/btservices/bluetoothappprofiles/avrcp" mrp="/sf/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+          </component>
+        </collection>
+        <collection name="btservices_info" long-name="BT Services Info" level="plugin">
+          <component name="btservices_plat" filter="s60" long-name="BT Services Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/btservices/btservices_plat/group"/>
+          </component>
+          <component name="btservices_pub" filter="s60" long-name="BT Services Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/btservices/btservices_pub/group"/>
+          </component>
+          <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+          </component>
+          <component name="btservices_api_test" long-name="BT Services API Tests" purpose="development" filter="s60,api_test">
+            <unit/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/btservices/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
+    <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+      <component id="bteng" filter="s60" name="Bluetooth Engine">
+        <unit bldFile="bluetoothengine/bteng/group"/>
+      </component>
+      <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+        <unit bldFile="bluetoothengine/btnotif/group"/>
+          <!-- is this test needed as unit? -->
+        <!-- <unit bldFile="bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
+      </component>
+      <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+        <unit bldFile="bluetoothengine/btaudioman/group"/>
+      </component>
+      <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+        <unit bldFile="bluetoothengine/btmac/group"/>
+      </component>
+      <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+        <unit bldFile="bluetoothengine/btsac/group"/>
+      </component>
+      <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+        <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+        <!-- <unit bldFile="bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
+      </component>
+      <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+        <unit bldFile="bluetoothengine/btsap/group"/>
+      </component>
+      <component id="btui" filter="s60" name="Bluetooth UI">
+        <!-- <unit bldFile="bluetoothengine/btui/ecom/group"/> -->
+        <unit bldFile="bluetoothengine/btui/group"/>
+      </component>
+      <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+        <unit bldFile="bluetoothengine/btpbap/group"/>
+      </component>
+      <component id="bthid" filter="s60" name="Bluetooth HID">
+        <unit bldFile="bluetoothengine/bthid/group"/>
+      </component>
+    </collection>
+    <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+      <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+        <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+      </component>
+    </collection>
+    <collection id="btservices_info" name="BT Services Info" level="plugin">
+      <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+        <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/camerasrv/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="camerasrv" name="Camera Services" levels="plugin fw api">
+    <collection id="camappengine" name="Camera App Engine" level="fw">
+      <component id="stillconverter" filter="s60" name="Still Image Converter">
+        <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+      </component>
+      <component id="camappengine_engine" filter="s60" name="Camera App Engine">
+		<!-- should separate this from parent engine's bld.inf  -->
+        <!-- <unit bldFile="camappengine/engine/group"/> -->
+      </component>
+      <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
+        <unit bldFile="camappengine/asynchfilesavequeue/group"/>
+		<!-- should next bld.inf be #included in previous? -->
+        <!-- <unit bldFile="camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
+        <unit bldFile="camappengine/build"/>
+      </component>
+    </collection>
+    <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+      <component id="mediarecorder" filter="s60" name="Camcorder Media Recorder">
+        <!-- <unit bldFile="camcordermmfplugin/mediarecorder/group"/> -->
+      </component>
+      <component id="filecomposer" filter="s60" name="File Composer">
+        <!-- <unit bldFile="camcordermmfplugin/filecomposer/group"/> -->
+      </component>
+      <component id="camcordermmfplugin_controller" filter="s60" name="Camcorder Controller MMF Plugin" class="plugin">
+        <!-- <unit bldFile="camcordermmfplugin/controller/group"/> -->
+      </component>
+      <component id="camcordermmfplugin_test" filter="s60" name="Camcorder MMF Plugin Test" purpose="development">
+        <!-- <unit bldFile="camcordermmfplugin/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build">
+		<!-- should split this into individual bld.inf files for the above components, or collapse all into a single component? -->
+        <unit bldFile="camcordermmfplugin/build"/>
+      </component>
+    </collection>
+    <collection id="configmanagers" name="Config Managers" level="api">
+      <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+        <unit bldFile="configmanagers/imagingconfigmanager/group"/>
+		<!-- should this test be #included in the above? -->
+        <!-- <unit bldFile="configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
+      </component>
+    </collection>
+    <collection id="camerasrv_info" name="Camera Services Info" level="api">
+      <component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
+        <unit bldFile="camerasrv_plat/group"/>
+		<!-- should below tests be #included? -->
+        <!-- <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
+        <!-- <unit bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
+        <!-- <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
+        <!-- <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group"/> -->
+      </component>
+      <component id="camerasrv_build" filter="s60" name="Camera Services Build">
+		<!-- should split into individual bld.infs -->
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/classicui/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/classicui/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,152 +1,326 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
-<collection name="commonuisupport" long-name="Common UI Support" level="support">
-<component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/mw/classicui/commonuisupport/uikon/group" mrp="/sf/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-</component>
-<component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
-<unit bldFile="/sf/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/sf/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-</component>
-<component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-<unit bldFile="/sf/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/sf/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-</component>
-<component name="grid" long-name="Grid" purpose="optional">
-<unit bldFile="/sf/mw/classicui/commonuisupport/grid/group" mrp="/sf/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-</component>
-<component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
-<unit mrp="/sf/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-</component>
-</collection>
-<collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-<component name="cone" long-name="Control Environment" purpose="mandatory">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-</component>
-<component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-</component>
-<component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-</component>
-<component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-</component>
-<component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-</component>
-<component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
-<unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-</component>
-</collection>
-<collection name="classicui_info" long-name="Classic UI Info" level="specific">
-<!-- the multiple units in the API components need to be resolved -->
-<component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="classicui">
-<unit bldFile="/sf/mw/classicui/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+        <collection name="ode" long-name="Open Dynamics Engine" level="support">
+          <!-- the collection is really a component. Move down a directory.-->
+          <component name="ode_build" filter="s60" long-name="ODE">
+            <unit bldFile="/sf/mw/classicui/ode/group"/>
+          </component>
+        </collection>
+        <collection name="uifw" long-name="UI Framework" level="server">
+          <component name="uiklaf" filter="s60" long-name="Uikon Look-and-Feel">
+            <unit bldFile="/sf/mw/classicui/uifw/uiklaf/group"/>
+          </component>
+          <component name="eikctl" filter="s60" long-name="Eikon Controls">
+            <unit bldFile="/sf/mw/classicui/uifw/eikctl/group"/>
+          </component>
+          <component name="avkon" filter="s60" long-name="Avkon">
+            <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+            <unit bldFile="/sf/mw/classicui/uifw/avkon/aknphysics/group"/>
+            <unit bldFile="/sf/mw/classicui/uifw/avkon/group"/>
+            <unit bldFile="/sf/mw/classicui/uifw/avkon/aknconf/group"/>
+          </component>
+          <component name="eikstd" filter="s60" long-name="Eikon Standard">
+            <unit bldFile="/sf/mw/classicui/uifw/eikstd/group"/>
+          </component>
+          <component name="aknglobalui" filter="s60" long-name="Avkon Global UI">
+            <unit bldFile="/sf/mw/classicui/uifw/aknglobalui/group"/>
+          </component>
+          <component name="ganes" filter="s60" long-name="Ganes">
+            <unit bldFile="/sf/mw/classicui/uifw/ganes/group"/>
+          </component>
+        </collection>
+        <collection name="commonuis" long-name="Common UIs" level="specific">
+          <component name="commonui" filter="s60" long-name="Common UI">
+            <unit bldFile="/sf/mw/classicui/commonuis/commonui/group"/>
+          </component>
+          <component name="commondialogs" filter="s60" long-name="Common Dialogs">
+            <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group"/>
+          </component>
+        </collection>
+        <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
+          <component name="aifwservicehandler" filter="s60" long-name="Application Interworking Service Handler">
+            <unit bldFile="/sf/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+          </component>
+        </collection>
+        <collection name="psln" long-name="Personalization" level="specific">
+          <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+          <component name="psln_build" filter="s60" long-name="Personalization Build">
+            <unit bldFile="/sf/mw/classicui/psln/group"/>
+          </component>
+        </collection>
+        <collection name="commonadapter" long-name="Common Adapter" level="support">
+          <!-- the collection is really a component. Move down a directory.-->
+          <component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
+            <unit bldFile="/sf/mw/classicui/commonadapter/group"/>
+          </component>
+        </collection>
+        <collection name="akntouchgesturefw" long-name="Avkon Touch Gesture Framework" level="generic">
+          <!-- the collection is really a component. Move down a directory.-->
+          <component name="akntouchgesturefw_build" filter="s60" long-name="Avkon Touch Gesture Framework Build" introduced="^3">
+            <unit bldFile="/sf/mw/classicui/akntouchgesturefw/group"/>
+          </component>
+        </collection>
+        <collection name="uiutils" long-name="UI Utils" level="specific">
+          <component name="localizer" filter="s60" long-name="Directory Localizer">
+            <unit bldFile="/sf/mw/classicui/uiutils/localizer/group"/>
+          </component>
+          <component name="findutil" filter="s60" long-name="Find Utility">
+            <unit bldFile="/sf/mw/classicui/uiutils/findutil/group"/>
+          </component>
+          <component name="gamerecognizer" filter="s60" long-name="Game Recognizer" plugin="Y">
+            <unit bldFile="/sf/mw/classicui/uiutils/gamerecognizer/group"/>
+          </component>
+          <component name="aknjapanesereading" filter="s60" long-name="Avkon Japanese Reading">
+            <unit bldFile="/sf/mw/classicui/uiutils/aknjapanesereading/group"/>
+          </component>
+        </collection>
+        <collection name="commonuisupport" long-name="Common UI Support" level="support">
+          <component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory">
+            <unit bldFile="/sf/mw/classicui/commonuisupport/uikon/group" mrp="/sf/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+          </component>
+          <component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory">
+            <unit bldFile="/sf/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/sf/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+          </component>
+          <component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+            <unit bldFile="/sf/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/sf/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+          </component>
+          <component name="grid" long-name="Grid" purpose="optional">
+            <unit bldFile="/sf/mw/classicui/commonuisupport/grid/group" mrp="/sf/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+          </component>
+          <component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc">
+            <unit mrp="/sf/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+          </component>
+        </collection>
+        <collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
+          <component name="cone" long-name="Control Environment" purpose="mandatory">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+          </component>
+          <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+          </component>
+          <component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+          </component>
+          <component name="clockanim" long-name="Clock" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+          </component>
+          <component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+          </component>
+          <component name="animation" long-name="Animation" introduced="9.1" purpose="optional">
+            <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+          </component>
+        </collection>
+        <collection name="classicui_info" long-name="Classic UI Info" level="specific">
+          <component name="classicui_pub" filter="s60" long-name="Classic UI Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/group"/>
+          </component>
+          <component name="classicui_plat" filter="s60" long-name="Classic UI Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/group"/>
+          </component>
+          <!-- the multiple units in the API test components need to be resolved -->
+          <component name="classicui_plat_api_test" filter="s60,api_test" long-name="Classic UI Platform API Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf -->
+            <unit bldFile="/sf/mw/classicui/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
+            <!--unit bldFile="classicui_plat/personalisation_framework_api/tsrc/group" /-->
+            <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_gesture_framework_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
+          </component>
+          <component name="classicui_pub_api_test" filter="s60,api_test" long-name="Classic UI Public API Tests" purpose="development">
+            <!-- can only have one unit. Need to #include from a single bld.inf -->
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
+          </component>
+          <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/classicui/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="classicui" name="Classic UI" levels="base support server generic specific">
+    <collection id="psln" name="Personalization" level="specific">
+      <component id="pslnengine" filter="s60" name="Personalization Engine">
+        <!-- <unit bldFile="psln/pslnengine/group"/> -->
+      </component>
+      <component id="pslnframework" filter="s60" name="Personalization Framework">
+        <!-- <unit bldFile="psln/pslnframework"/> -->
+      </component>
+      <component id="pslnlibraryloaders" filter="s60" name="Personalization Library Loaders">
+          <!-- no bld.inf, need to create one or remove component -->
+      </component>
+      <component id="pslnslidesetdialog" filter="s60" name="Personalization Slideset Dialog" class="plugin">
+        <!-- <unit bldFile="psln/pslnslidesetdialog/group"/> -->
+      </component>
+      <component id="pslngsplugin" filter="s60" name="Personalization GS Plugin" class="plugin">
+        <unit bldFile="psln/pslngsplugin/group"/>
+      </component>
+      <component id="psln_help" filter="s60" name="Personalization Help">
+        <unit bldFile="psln/help/group"/>
+      </component>
+      <component id="psln_build" filter="s60" name="Personalization Build">
+             <!-- the Psln group bld.inf should be distributed into the individual components, or they should be collapsed in a single component -->
+        <unit bldFile="psln/group"/>
+      </component>
+    </collection>
+    <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+      <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handle">
+        <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
+      </component>
+    </collection>
+    <collection id="commonuis" name="Common UIs" level="specific">
+      <component id="commonui" filter="s60" name="Common UI">
+        <unit bldFile="commonuis/commonui/group"/>
+      </component>
+      <component id="commondialogs" filter="s60" name="Common Dialogs">
+        <unit bldFile="commonuis/commondialogs/group"/>
+        <!-- <unit bldFile="commonuis/commondialogs/group_test"/> -->
+      </component>
+    </collection>
+    <collection id="uifw" name="UI Framework" level="server">
+      <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+        <unit bldFile="uifw/uiklaf/group"/>
+      </component>
+      <component id="eikctl" filter="s60" name="Eikon Controls">
+        <unit bldFile="uifw/eikctl/group"/>
+      </component>
+      <component id="avkon" filter="s60" name="Avkon">
+        <unit bldFile="uifw/avkon/aknphysics/group"/>
+        <unit bldFile="uifw/avkon/group"/>
+        <unit bldFile="uifw/avkon/odeconf/group"/>
+        <!-- <unit bldFile="uifw/avkon/aknhlist/group"/> -->
+        <!-- <unit bldFile="uifw/avkon/aknkeyrotator/group"/> -->
+        <!-- <unit bldFile="uifw/avkon/prebuilder"/> -->
+        <!-- <unit bldFile="uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
+      </component>
+      <component id="eikstd" filter="s60" name="Eikon Standard">
+        <unit bldFile="uifw/eikstd/group"/>
+      </component>
+      <component id="aknglobalui" filter="s60" name="Avkon Global UI">
+        <unit bldFile="uifw/aknglobalui/group"/>
+      </component>
+      <component id="ganes" filter="s60" name="Ganes">
+        <unit bldFile="uifw/ganes/group"/>
+      </component>
+      <component id="uifw_test" filter="s60" name="UI Framework Test" purpose="development">
+        <!-- <unit bldFile="uifw/tsrc/group"/> -->
+      </component>
+    </collection>
+    <collection id="commonadapter" name="Common Adapter" level="support">
+      <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+        <unit bldFile="commonadapter/group"/>
+      </component>
+    </collection>
+    <collection id="ode" name="Open Dynamics Engine" level="support">
+      <component id="ode_build" filter="s60" name="ODE">
+        <unit bldFile="ode/group"/>
+      </component>
+    </collection>
+    <collection id="commonuisupport" name="Common UI Support" level="support">
+      <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+        <unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+      </component>
+      <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+        <unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+      </component>
+      <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+        <unit bldFile="commonuisupport/uilaf/GROUP" mrp="commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+      </component>
+      <component id="grid" name="Grid" purpose="optional">
+        <unit bldFile="commonuisupport/grid/group" mrp="commonuisupport/grid/group/app-framework_grid.mrp"/>
+      </component>
+      <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+        <unit mrp="commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+      </component>
+    </collection>
+    <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+      <component id="cone" name="Control Environment" purpose="mandatory">
+        <unit bldFile="lafagnosticuifoundation/cone/group" mrp="lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+      </component>
+      <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+        <unit bldFile="lafagnosticuifoundation/graphicseffects/group" mrp="lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+      </component>
+      <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+        <unit bldFile="lafagnosticuifoundation/uigraphicsutils/group" mrp="lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+      </component>
+      <component id="clockanim" name="Clock" purpose="optional" class="plugin">
+        <unit bldFile="lafagnosticuifoundation/clockanim/group" mrp="lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+      </component>
+      <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+        <unit bldFile="lafagnosticuifoundation/bmpanimation/group" mrp="lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+      </component>
+      <component id="animation" name="Animation" introduced="9.1" purpose="optional">
+        <unit bldFile="lafagnosticuifoundation/animation/group" mrp="lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+      </component>
+    </collection>
+    <collection id="classicui_info" name="Classic UI Info" level="specific">
+       <!-- the multiple units in the API components need to be resolved -->
+      <component id="classicui_pub" filter="s60" name="Classic UI Public Interfaces" class="api">
+        <unit bldFile="classicui_pub/group"/>
+      </component>
+      <component id="classicui_plat" filter="s60" name="Classic UI Platform Interfaces" class="api">
+        <unit bldFile="classicui_plat/group"/>
+      </component>
+      <component id="classicui_test" filter="s60" name="Classic UI Tests" purpose="development">
+        <unit bldFile="classicui_plat/tsrc/group"/>
+        <unit bldFile="classicui_pub/document_handler_api/tsrc/group"/>
+        <unit bldFile="classicui_pub/server_application_api/tsrc/group"/>
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
+        <!-- <unit bldFile="classicui_pub/tsrc/bc/group"/> -->
+        <!-- <unit bldFile="classicui_plat/avkon_testability_api/tsrc/group"/> -->
+        <!-- <unit bldFile="classicui_plat/extended_sounds_api/tsrc/group"/> -->
+        <unit bldFile="classicui_plat/ganes_api/tsrc/group"/>
+        <unit bldFile="classicui_plat/physics_api/tsrc/group"/>
+      </component>
+      <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="dlnasrv" name="DLNA Services" levels="stack server ctrl framework plugin">
+    <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+      <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+        <unit bldFile="upnpavcontrolpoint/avcontrolframework/group"/>
+      </component>
+      <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+        <unit bldFile="upnpavcontrolpoint/group"/>
+      </component>
+    </collection>
+    <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+      <component id="avobjects" filter="s60" name="A/V Objects">
+        <unit bldFile="upnpmediaserver/avobjects/group"/>
+      </component>
+      <component id="mediaserverclient" filter="s60" name="Media Server Client">
+        <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
+      </component>
+      <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+        <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
+      </component>
+      <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+        <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
+      </component>
+      <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+        <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+      </component>
+      <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpmediaserver/group"/>
+      </component>
+    </collection>
+    <collection id="upnpstack" name="UPnP Stack" level="stack">
+      <component id="upnputils" filter="s60" name="UPnP Utils">
+        <unit bldFile="upnpstack/upnputils/group"/>
+      </component>
+      <component id="upnpconnectionmanagersession" filter="s60" name="UPnP Connection Manager Session">
+        <unit bldFile="upnpstack/upnpconnectionmanagersession/group"/>
+      </component>
+      <component id="upnpconnmanager" filter="s60" name="UPnP Connection Manager">
+        <unit bldFile="upnpstack/upnpconnmanager/group"/>
+      </component>
+      <component id="dlnawebserver" filter="s60" name="DLNA Web Server">
+        <unit bldFile="upnpstack/dlnawebserver/group"/>
+      </component>
+      <component id="serviceframework" filter="s60" name="Service Framework">
+        <unit bldFile="upnpstack/serviceframework/group"/>
+      </component>
+      <component id="ssdpserver" filter="s60" name="SSDP Server">
+        <unit bldFile="upnpstack/ssdpserver/group"/>
+      </component>
+      <component id="messagehandler" filter="s60" name="Message Handler">
+        <unit bldFile="upnpstack/messagehandler/group"/>
+      </component>
+      <component id="controlpointbase" filter="s60" name="Control Point Base">
+        <unit bldFile="upnpstack/controlpointbase/group"/>
+      </component>
+      <component id="upnphttptransfer" filter="s60" name="UPnP HTTP Transfer">
+        <unit bldFile="upnpstack/upnphttptransfer/group"/>
+      </component>
+      <component id="upnpstack_build" filter="s60" name="UPnP Stack Build">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpstack/group"/>
+      </component>
+    </collection>
+    <collection id="upnpsharing" name="UPnP Sharing" level="server">
+      <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+        <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
+      </component>
+      <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+        <unit bldFile="upnpsharing/upnpsecurity/group"/>
+      </component>
+      <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+        <unit bldFile="upnpsharing/upnpcontentserver/group"/>
+      </component>
+      <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+        <unit bldFile="upnpsharing/applicationengine/group"/>
+      </component>
+      <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpsharing/group"/>
+      </component>
+    </collection>
+    <collection id="upnpsettings" name="UPnP Settings" level="framework">
+      <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+        <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
+      </component>
+      <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpsettings/multiselectionui/group"/>
+      </component>
+      <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpsettings/appwizard/group"/>
+      </component>
+      <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpsettings/upnpsharingui/group"/>
+      </component>
+      <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+        <unit bldFile="upnpsettings/upnpgsplugin/group"/>
+      </component>
+      <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpsettings/group"/>
+      </component>
+    </collection>
+    <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+      <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+        <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
+      </component>
+      <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpmpxplugins/group"/>
+      </component>
+    </collection>
+    <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+      <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+		<!-- need to merge or #include these to a single bld.inf -->
+        <unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+        <unit bldFile="upnpharvester/common/dbmanager/group"/>
+      </component>
+      <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpharvester/cdssync/common"/>
+      </component>
+      <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpharvester/mdhserver/group"/>
+      </component>
+      <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpharvester/group"/>
+      </component>
+    </collection>
+    <collection id="upnpframework" name="UPnP Framework" level="framework">
+      <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+        <unit bldFile="upnpframework/upnputilities/group"/>
+      </component>
+      <component id="upnpextensionpluginif" filter="s60" name="UPnP Extension Plugin Interface" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
+      </component>
+      <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpframework/upnpfiletransferengine/group"/>
+      </component>
+      <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+        <unit bldFile="upnpframework/upnpmusicadapter/group"/>
+      </component>
+      <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpframework/upnpcommonui/group"/>
+      </component>
+      <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+        <unit bldFile="upnpframework/upnpcommand/group"/>
+      </component>
+      <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpframework/upnpaiwengine/group"/>
+      </component>
+      <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+        <unit bldFile="upnpframework/upnpaiwprovider/group"/>
+      </component>
+      <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpframework/group"/>
+      </component>
+    </collection>
+    <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+      <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+        <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
+      </component>
+      <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+        <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
+      </component>
+      <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+        <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
+      </component>
+      <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+        <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
+      </component>
+      <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+		<!-- consider moving content into above components -->
+        <unit bldFile="upnpavcontroller/group"/>
+      </component>
+    </collection>
+    <collection id="homesync" name="Home Sync" level="plugin">
+      <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+		<!-- need to merge or #include these to a single bld.inf or split into individual componens -->
+        <unit bldFile="homesync/contentmanager/cmserver/cmfillmanager/group"/>
+        <unit bldFile="homesync/contentmanager/cmserver/cmmemorymanager/group"/>
+        <unit bldFile="homesync/contentmanager/cmserver/cmscheduler/group"/>
+        <unit bldFile="homesync/contentmanager/cmserver/cmserver/group"/>
+        <unit bldFile="homesync/contentmanager/cmserver/cmstoremanager/group"/>
+        <unit bldFile="homesync/contentmanager/homesyncgsplugin/group"/>
+        <unit bldFile="homesync/contentmanager/homesyncwizard/group"/>
+        <unit bldFile="homesync/contentmanager/mediaservant/applicationengine/group"/>
+        <unit bldFile="homesync/contentmanager/mediaservant/group"/>
+      </component>
+      <component id="homesync_build" filter="s60" name="Home Sync Build" introduced="^2" deprecated="^3">
+		<!-- consider moving content into above components -->
+        <unit bldFile="homesync/group"/>
+      </component>
+    </collection>
+    <collection id="homemedia" name="Home Media" level="framework">
+      <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+        <unit bldFile="homemedia/group"/>
+      </component>
+    </collection>
+    <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+      <component id="dlnasrv_plat" filter="s60" name="DLNA Services Platform Interfaces" class="api">
+        <unit bldFile="dlnasrv_plat/group"/>
+      </component>
+      <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/drm/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/drm/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,109 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="drm">
-<collection name="s60">
-<component name="drm">
-<unit bldFile="/sf/mw/drm/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+        <collection name="commondrm" long-name="Common DRM" level="generic">
+          <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+          <component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
+            <!-- this should have its own bld.inf or be removed as a component -->
+          </component>
+          <component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
+            <!-- this should have its own bld.inf or be removed as a component -->
+          </component>
+          <component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
+            <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+          </component>
+          <component name="drmutility" filter="s60" long-name="DRM Utility">
+            <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
+          </component>
+          <component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
+            <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+          </component>
+          <component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
+            <unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+          </component>
+          <component name="commondrm_build" filter="s60" long-name="Common DRM Build">
+            <!-- should be split into the above files, or them collapsed into a single component -->
+            <unit bldFile="/sf/mw/drm/commondrm/group"/>
+          </component>
+        </collection>
+        <collection name="omadrm" long-name="OMA DRM" level="server">
+          <!-- collection is really a component. Move down a directory -->
+          <component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
+            <unit bldFile="/sf/mw/drm/omadrm/group"/>
+          </component>
+        </collection>
+        <collection name="wmdrm" long-name="Windows Media DRM" level="framework">
+          <!-- collection is really a component. Move down a directory -->
+          <component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
+            <unit bldFile="/sf/mw/drm/wmdrm/group"/>
+          </component>
+        </collection>
+        <collection name="drm_info" long-name="DRM Info" level="specific">
+          <component name="drm_pub" filter="s60" long-name="DRM Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/drm/drm_pub/group"/>
+          </component>
+          <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/drm/drm_plat/group"/>
+          </component>
+          <component name="drm_api_test" filter="s60,api_test" long-name="DRM Build" purpose="development">
+            <unit bldFile="/sf/mw/drm/tsrc/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="drm" name="DRM" levels="plugin framework server generic specific">
+    <collection id="commondrm" name="Common DRM" level="generic">
+      <component id="drmencryptor" filter="s60" name="DRM Encryptor">
+		<!-- this should have its own bld.inf or be removed as a component -->
+      </component>
+      <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+		<!-- this should have its own bld.inf or be removed as a component -->
+      </component>
+      <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+        <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
+      </component>
+      <component id="drmutility" filter="s60" name="DRM Utility">
+        <unit bldFile="commondrm/drmutility/group"/>
+      </component>
+      <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+        <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
+      </component>
+      <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+        <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
+      </component>
+      <component id="commondrm_build" filter="s60" name="Common DRM Build">
+		<!-- should be split into the above files, or them collapsed into a single component -->
+        <unit bldFile="commondrm/group"/>
+      </component>
+    </collection>
+    <collection id="omadrm" name="OMA DRM" level="server">
+      <component id="drmroapwbxmlparser" filter="s60" name="DRM ROAP WBXML Parser">
+        <!-- <unit bldFile="omadrm/drmroapwbxmlparser/group"/> -->
+      </component>
+      <component id="drmplugins" filter="s60" name="DRM Plugins" class="plugin">
+		<!-- should have a single bld.inf -->
+        <!-- <unit bldFile="omadrm/drmplugins/drmfilter/group"/> -->
+        <!-- <unit bldFile="omadrm/drmplugins/drmrecognizer/group"/> -->
+        <!-- <unit bldFile="omadrm/drmplugins/drmrohandler/group"/> -->
+        <!-- <unit bldFile="omadrm/drmplugins/drmromtm/group"/> -->
+      </component>
+      <component id="drmengine" filter="s60" name="DRM Engine">
+		<!-- this should have its own bld.inf or be removed as a component -->
+      </component>
+      <component id="drmhelper" filter="s60" name="DRM Helper">
+        <!-- <unit bldFile="omadrm/drmhelper/group"/> -->
+		<!-- should drmhelperserver be #included in the above? -->
+        <!-- <unit bldFile="omadrm/drmhelper/drmhelperserver/group"/> -->
+      </component>
+      <component id="drmlicensemanager" filter="s60" name="DRM License Manager">
+        <!-- <unit bldFile="omadrm/drmlicensemanager/group"/> -->
+      </component>
+      <component id="omadrm_build" filter="s60" name="OMA DRM Build">
+		<!-- should be split into the above files, or them collapsed into a single component -->
+        <unit bldFile="omadrm/group"/>
+      </component>
+    </collection>
+    <collection id="wmdrm" name="Windows Media DRM" level="framework">
+      <component id="wmdrmengine" filter="s60" name="WM DRM Engine">
+		<!-- should have a single bld.inf -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmagent/group"/> -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
+        <!-- <unit bldFile="wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
+      </component>
+      <component id="camese" filter="s60" name="Camese">
+		<!-- should have a single bld.inf -->
+        <!-- <unit bldFile="wmdrm/camese/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/cameseutility/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/httpfiltercamese/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdla/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdlaapp/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdlautils/group"/> -->
+        <!-- <unit bldFile="wmdrm/camese/wmdrmdlawrapper/group"/> -->
+      </component>
+      <component id="wmdrm_build" filter="s60" name="WM DRM Build">
+		<!-- should be split into the above files, or them collapsed into a single component -->
+        <unit bldFile="wmdrm/group"/>
+      </component>
+    </collection>
+    <collection id="drm_info" name="DRM Info" level="specific">
+      <component id="drm_pub" filter="s60" name="DRM Public Interfaces" class="api">
+        <unit bldFile="drm_pub/group"/>
+		<!-- do the following need to be #included ? -->
+        <!-- <unit bldFile="drm_pub/drm_helper_api/tsrc/group"/> -->
+        <!-- <unit bldFile="drm_pub/drm_license_checker_api/tsrc/group"/> -->
+        <!-- <unit bldFile="drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+      </component>
+      <component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
+        <unit bldFile="drm_plat/group"/>
+		<!-- do the following need to be #included ? -->
+        <!-- <unit bldFile="drm_plat/drm_common_api/tsrc/group"/> -->
+        <!-- <unit bldFile="drm_plat/drm_rights_api/tsrc/group"/> -->
+        <!-- <unit bldFile="drm_plat/roap_api/tsrc/group"/> -->
+      </component>
+      <component id="drm_build" filter="s60" name="DRM Build">
+		<!-- is this needed ? -->
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/gsprofilesrv/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,109 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="gsprofilesrv">
-<collection name="s60">
-<component name="gsprofilesrv">
-<unit bldFile="/sf/mw/gsprofilesrv/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="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">
+        <collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
+          <component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
+            <unit bldFile="/sf/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+          </component>
+        </collection>
+        <collection name="profilesservices" long-name="Profiles Services" level="server">
+          <component name="filelist" filter="s60" long-name="File List" introduced="9.1">
+            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/filelist/group"/>
+          </component>
+          <component name="mediafilelist" filter="s60" long-name="Media File List" introduced="^2">
+            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
+          </component>
+          <component name="profileengine" filter="s60" long-name="Profile Engine" introduced="9.1">
+            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/profileengine/group"/>
+          </component>
+          <component name="ringingtone3dplugin" filter="s60" long-name="Ringing Tone 3D Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
+          </component>
+        </collection>
+        <collection name="gsprofilesrv_info" long-name="GS and Profiles Services Info" level="specific">
+          <component name="gsprofilesrv_plat" filter="s60" long-name="GS and Profiles Services Platform Interfaces" class="api">
+            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/group"/>
+          </component>
+          <component name="gsprofilesrv_pub" filter="s60" long-name="GS and Profiles Services Public Interfaces" class="api">
+            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_pub/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="gsprofilesrv" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+    <collection id="gssettingsuis" name="General Settings UIs" level="framework">
+      <component id="gs" filter="s60" name="General Settings" introduced="9.2">
+        <unit bldFile="gssettingsuis/gs/group"/>
+      </component>
+    </collection>
+    <collection id="profilesservices" name="Profiles Services" level="server">
+      <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+        <unit bldFile="profilesservices/profileengine/group"/>
+      </component>
+      <component id="filelist" filter="s60" name="File List" introduced="9.1">
+        <unit bldFile="profilesservices/filelist/group"/>
+      </component>
+      <component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
+        <unit bldFile="profilesservices/mediafilelist/group"/>
+      </component>
+      <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
+        <unit bldFile="profilesservices/ringingtone3dplugin/group"/>
+      </component>
+    </collection>
+    <collection id="gsprofilesrv_info" name="GS and Profiles Services Info" level="specific">
+      <component id="gsprofilesrv_plat" filter="s60" name="GS and Profiles Services Platform Interfaces" class="api">
+        <unit bldFile="gsprofilesrv_plat/group"/>
+      </component>
+      <component id="gsprofilesrv_pub" filter="s60" name="GS and Profiles Services Public Interfaces" class="api">
+        <unit bldFile="gsprofilesrv_pub/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

--- a/symbian3/mw/hapticsservices/package_definition.xml	Fri Jan 29 14:35:06 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -1,109 +1,119 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="mw">
-<block name="hapticsservices">
-<collection name="s60">
-<component name="hapticsservices">
-<unit bldFile="/sf/mw/hapticsservices/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="mw" long-name="Middleware" levels="generic specific">
+      <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+        <collection name="tacticonserver" long-name="Tacticon Server" level="server">
+          <!-- collection is really a component. Move down a directory  -->
+          <component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
+            <unit bldFile="/sf/mw/hapticsservices/tacticonserver/group"/>
+            <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+          </component>
+        </collection>
+        <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
+          <component name="tactilearearegistry" filter="s60" long-name="Tactile Area Registry" introduced="^1">
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+          </component>
+          <component name="tactilefeedbackresolver" filter="s60" long-name="Tactile Feedback Resolver" introduced="^1">
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+          </component>
+          <component name="tactileclickplugin" filter="s60" long-name="Tactile Click Plugin" introduced="^1" plugin="Y">
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+          </component>
+          <component name="tactilefeedbackclient" filter="s60" long-name="Tactile Feedback Client" introduced="^1">
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+          </component>
+          <component name="tactileactionplugin" filter="s60" long-name="Tactile Action Plugin" introduced="^1" plugin="Y">
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+          </component>
+          <component name="tactilefeedback_build" filter="s60" long-name="Tactile Feedback Build" introduced="^1">
+            <!-- consider moving IBY to one fo the above components -->
+            <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/group"/>
+          </component>
+        </collection>
+        <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
+          <component name="hapticsservices_pub" filter="s60" long-name="Haptics Services Public Interfaces" introduced="^1" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_pub/group"/>
+          </component>
+          <component name="hapticsservices_plat" filter="s60" long-name="Haptics Services Platform Interfaces" introduced="^1" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/mw/hapticsservices/package_definition_3.0.xml	Fri Jan 29 16:25:53 2010 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="hapticsservices" name="Haptics Services" levels="fw api">
+    <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+      <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+        <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
+      </component>
+      <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+        <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
+      </component>
+      <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+		<!-- consider moving IBY to one fo the above components -->
+        <unit bldFile="tactilefeedback/group"/>
+      </component>
+    </collection>
+    <collection id="hapticsservices_info" name="Haptics Services Info" level="api">
+      <component id="hapticsservices_pub" filter="s60" name="Haptics Services Public Interfaces" class="api" introduced="^1">
+        <unit bldFile="hapticsservices_pub/group"/>
+      </component>
+      <component id="hapticsservices_plat" filter="s60" name="Haptics Services Platform Interfaces" class="api" introduced="^1">
+        <unit bldFile="hapticsservices_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>

author	Bob Rosenberg <bob.rosenberg@nokia.com>
	Fri, 29 Jan 2010 16:25:53 +0000
branch	HighFidelityModel
changeset 43	35cc8ff825d7
parent 42	82a6c2dffce1
child 44	0b761d12ae12

symbian3/mw/accesssec/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/accesssec/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appinstall/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appinstall/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appsupport/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appsupport/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/btservices/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/btservices/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/camerasrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/classicui/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/classicui/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/dlnasrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/drm/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/drm/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/gsprofilesrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/gsprofilesrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/hapticsservices/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/hapticsservices/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions