--- a/symbian3/mw/remotemgmt/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,221 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!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="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
-    <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
-     </component>
-     <component name="provisioning" long-name="provisioning" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
-     </component>
-    </collection>
-    <collection name="policymanagement" long-name="Policy Management" level="generic">
-     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-     </component>
-     <component name="dmutilserver" long-name="DM Util Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/dmutilserver/group"/>
-     </component>
-     <component name="policyengine" long-name="Polic Eengine" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/group"/>
-     </component>
-     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
-     </component>
-    </collection>
-    <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-     <component name="syncmlfw_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/debug/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/historylog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/http/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/modifiedheaders"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/policy"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/symbianheaders"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/notifiers/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexcommserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexdmplugin/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexdsplugin/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexserverbinding/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_clientapi/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_privateapi/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_transporthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/transport/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/xml/bld"/>
-     </component>
-     <component name="ds" long-name="DS" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/alerthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/changefinder/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/dbcaps/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/filter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/filterutils/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/profileutil/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/storeformat/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostserverbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/settings/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
-     </component>
-     <component name="dm" long-name="DM" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/callbackserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/hostserver/dmhostservers/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/provisioningadapter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/settings/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
-     </component>
-     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
-     </component>
-     <component name="syncservice" long-name="Sync Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/syncservice/group"/>
-     </component>
-     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/group"/>
-     </component>
-    </collection>
-    <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="scp" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-     </component>
-     <component name="terminalsecurity_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/client/group"/>
-     </component>
-     <component name="terminalsecurity_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/server/group"/>
-     </component>
-     <component name="tcadapter" long-name="TC Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-     </component>
-     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/group"/>
-     </component>
-    </collection>
-    <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-     <component name="diagframework" long-name="Diagnostics Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-     </component>
-     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-     </component>
-     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-     </component>
-     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/group"/>
-     </component>
-    </collection>
-    <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
-     <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
-     </component>
-     <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
-     <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
-     </component>
-     <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
-     <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
-     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-     </component>
-    <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<layer name="mw">
+<block name="remotemgmt">
+<collection name="s60">
+<component name="remotemgmt">
+<unit bldFile="/sf/mw/remotemgmt/group" mrp=""/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>