--- a/CompilerCompatibility/app/settingsuis/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/app/settingsuis/package_definition.xml	Tue Mar 16 16:25:56 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,61 +49,43 @@
   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">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="settingsuis" level="services" long-name="Settings UIs">
-<collection name="s60">
-<component name="settingsuis">
-<unit bldFile="/sf/app/settingsuis/group" mrp=""/>
-</component>
-</collection>
-</block>
+<block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
+    <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
+     <component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
+      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/services_db/group"/>
+     </component>
+     <component name="defaultapplicationsettings_server" filter="s60" long-name="Default Application Server" introduced="^1">
+      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/server/group"/>
+     </component>
+     <component name="service" filter="s60" long-name="Default Application Service" introduced="^1">
+      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/service/group"/>
+     </component>
+     <component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
+      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
+     </component>
+     <component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
+      <!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
+      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/group"/>
+     </component>
+    </collection>
+    <collection name="systemswuis" long-name="System SW UIs" level="ui">
+     <component name="touchscreencalib" filter="s60" long-name="Touchscreen Calibration" introduced="^1">
+      <unit bldFile="/sf/app/settingsuis/systemswuis/touchscreencalib/group"/>
+     </component>
+    </collection>
+    <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
+     <component name="devmngt_plat" filter="s60" long-name="Settings UIs Platform Interfaces" introduced="^1" class="api">
+      <unit bldFile="/sf/app/settingsuis/devmngt_plat/group"/>
+     </component>
+     <component name="devmngt_pub" filter="s60" long-name="Settings UIs Public Interfaces" introduced="^1" class="api">
+      <unit bldFile="/sf/app/settingsuis/devmngt_pub/group"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file