--- a/symbian4/mw/remotemgmt/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
@@ -129,21 +129,6 @@
 <component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
 <component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
 <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
@@ -227,23 +212,6 @@
 <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
 </component>
 </collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!--  can only have one unit, merge or split into two components -->
-<unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!--  need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
 <collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
 <component name="dcmoclient" filter="s60" long-name="DCMO Client">
 <unit bldFile="/sf/mw/remotemgmt/dcmofw/dcmoclient/group"/>
@@ -260,17 +228,15 @@
 </component>
 </collection>
 <collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="/sf/mw/remotemgmt/fotaapplication/group"/>
+<component name="fotaserver" filter="s60" long-name="FOTA Server">
+<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/group"/>
 </component>
-<component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
 </component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+<!-- really need to find a better way to do this -->
+<component name="fotacustcmds-alt" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
 </component>
 </collection>
 </block>