--- a/symbian3/app/settingsuis/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/app/settingsuis/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,38 +54,38 @@
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <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>
+<collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
+<component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
+<unit bldFile="/sf/app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+</component>
+<component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
+<unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+</component>
+</collection>
+<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>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file