diff -r 1553c141c99f -r 5dfc4b38cad0 3k/mw/remotemgmt/package_definition.xml
--- a/3k/mw/remotemgmt/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/remotemgmt/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <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">
+     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
       <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
       <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
      </component>
-     <component name="provisioning" long-name="provisioning" origin-model="Foundation">
+     <component name="provisioning" long-name="provisioning" origin-model="foundation">
       <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
       <!-- <unit bldFile="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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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"/>
@@ -53,7 +53,7 @@
       <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">
+     <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"/>
@@ -75,7 +75,7 @@
       <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">
+     <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"/>
@@ -90,230 +90,131 @@
       <!-- <unit bldFile="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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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">
+     <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="ahle" long-name="Adaptive History List" level="generic">
-     <component name="ahleserver" long-name="Adaptive History List Server" origin-model="Foundation"/>
-     <component name="ahleclient" long-name="Adaptive History List Client" origin-model="Foundation"/>
-    </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">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
-      <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="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">
+     <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="fotaapplication" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/fotaapplication/group"/>
+     <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="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="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>
-    <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-     <component unofficial="yes" name="synchronization_capability_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-     </component>
-    </collection>
-    <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-     <component unofficial="yes" name="adaptive_history_list_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="pnpms_utils_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_framework_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptive_history_list_session_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_utils_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_utility_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="device_management_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scp_server_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="syncml_client_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="obex_client_session_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_request_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_ds_extensions_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_tree_apis" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-     </component>
-     <component unofficial="yes" name="dm_constant_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_adapter_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="setting_enforcement_info_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_management_parameter_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_alert_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_service_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_certificate_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_results_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_notification_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="ds_constant_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="update_package_storage_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_roaming_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-     </component>
-     <component unofficial="yes" name="terminal_security_device_lock_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_agent_util_and_definitions_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_pool_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_alert_handler_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="fota_engine_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-     </component>
-    </collection>
    </block>
 </layer>
 </systemModel>