--- a/symbian4/app/devicecontrol/package_definition.xml	Wed Jun 30 13:21:56 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Wed Jun 30 15:34:41 2010 +0100
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.0">
+  <package id="devicecontrol" name="Device Control Daemons" levels="support mid app">
+    <collection id="devicemgmtdialogsplugin" name="Device Management Dialogs Plugin" level="support">
+      <!-- need to put component at the proper directory level -->
+      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+        <unit bldFile="devicemgmtdialogsplugin" qt:proFile="devicemgmtdialogsplugin.pro"/>
+      </component>
+    </collection>
     <collection id="deviceupdatesui" name="Device Updates UI" level="app">
-      <component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
-        <unit bldFile="deviceupdatesui/adapters/bld"/>
-      </component>
       <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
         <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
       </component>
@@ -14,11 +17,82 @@
       <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
         <unit bldFile="deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
       </component>
+    </collection>
+    <collection id="clientprovisioning" name="Client Provisioning" level="mid">
       <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-        <unit bldFile="deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+        <unit bldFile="clientprovisioning/cpqtsp" qt:proFile="cpqtsp.pro"/>
+      </component>
+    </collection>
+    <collection id="omadmadapters" name="OMA DM Adapters" level="support">
+      <component id="omadmadapters_build" name="OMA DM Adapters Build" filter="s60">
+        <!-- need to split IBY into the components or make this a ROM component -->
+        <unit bldFile="omadmadapters/bld"/>
+      </component>
+      <component id="devinfo" name="Device Info" filter="s60">
+        <unit bldFile="omadmadapters/devinfo/bld"/>
+      </component>
+      <component id="devdetail" name="Device Detail" filter="s60">
+        <unit bldFile="omadmadapters/devdetail/bld"/>
+      </component>
+      <component id="syncmldm" name="SyncML DM" filter="s60">
+        <unit bldFile="omadmadapters/syncmldm/bld"/>
+      </component>
+      <component id="syncmldm12" name="SyncML DM 1.2" filter="s60">
+        <unit bldFile="omadmadapters/syncmldm12/bld"/>
+      </component>
+      <component id="omadm_browseradapter" name="Browser Adapter" filter="s60" class="plugin">
+        <!--  <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+      </component>
+      <component id="omadm_streamingadapter" name="Streaming Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/streamingadapter/bld"/>
+      </component>
+      <component id="globalwlansettings" name="Global WLAN Settings" filter="s60">
+        <unit bldFile="omadmadapters/globalwlansettings/group"/>
+      </component>
+      <component id="nsmldminternet" name="nsmldminternet" filter="s60">
+        <!--  <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+      </component>
+      <component id="nsmldmalwaysonadapter" name="Always Online Device Management Adapter" filter="s60" introduced="9.1" class="plugin">
+        <unit bldFile="omadmadapters/nsmldmalwaysonadapter/group"/>
       </component>
-      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
-        <unit bldFile="deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+      <component id="nsmldmbmadapter" name="NSML DM BM Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/nsmldmbmadapter/group"/>
+      </component>
+      <component id="connmoadapter" name="Connection Management Object Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/connmoadapter/group"/>
+      </component>
+      <component id="syncmlds" name="SyncML Data Sync" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_DS"/>
+        </meta>
+        <unit bldFile="omadmadapters/syncmlds/bld"/>
+      </component>
+      <component id="omadm_email" name="OMA DM Email" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_EMAIL"/>
+        </meta>
+        <unit bldFile="omadmadapters/email/bld"/>
+      </component>
+      <component id="omadm_mms" name="OMA DM MMS" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_MMS"/>
+        </meta>
+        <unit bldFile="omadmadapters/mms/bld"/>
+      </component>
+      <component id="omadm_fota" name="OMA DM FOTA" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_FOTA"/>
+        </meta>
+        <!--  <unit bldFile="omadmadapters/fota/bld"/> -->
+      </component>
+      <component id="omadm_imps" name="OMA DM IMPS" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_IMPS"/>
+        </meta>
+        <!--  <unit bldFile="omadmadapters/imps/bld"/> -->
+      </component>
+      <component id="dcmodmadapter" name="DC Management Object  DM Adapter" filter="s60" class="plugin">
+        <!--  <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
       </component>
     </collection>
   </package>