diff -r 4469f26a2533 -r a44ae815a47f symbian3/mw/drm/package_definition.xml
--- a/symbian3/mw/drm/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/drm/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,56 +54,107 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
-    <collection name="commondrm" long-name="Common DRM" level="generic">
-     <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-     <component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-      <!-- this should have its own bld.inf or be removed as a component -->
-     </component>
-     <component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-      <!-- this should have its own bld.inf or be removed as a component -->
-     </component>
-     <component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
-      <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-     </component>
-     <component name="drmutility" filter="s60" long-name="DRM Utility">
-      <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-      <!--<unit bldFile="commondrm/drmutility/group"/>-->
-     </component>
-     <component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
-      <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
-     </component>
-     <component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
-      <unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
-     </component>
-     <component name="commondrm_build" filter="s60" long-name="Common DRM Build">
-      <!-- should be split into the above files, or them collapsed into a single component -->
-      <unit bldFile="/sf/mw/drm/commondrm/group"/>
-     </component>
-    </collection>
-    <collection name="omadrm" long-name="OMA DRM" level="server">
-     <!-- collection is really a component. Move down a directory -->
-     <component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
-      <unit bldFile="/sf/mw/drm/omadrm/group"/>
-     </component>
-     <component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
-      <unit bldFile="/sf/mw/drm/omadrm/foundationcerts/group"/>
-     </component>
-    </collection>
-    <collection name="wmdrm" long-name="Windows Media DRM" level="framework">
-     <!-- collection is really a component. Move down a directory -->
-     <component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
-      <unit bldFile="/sf/mw/drm/wmdrm/group"/>
-     </component>
-    </collection>
-    <collection name="drm_info" long-name="DRM Info" level="specific">
-     <component name="drm_pub" filter="s60" long-name="DRM Public Interfaces" class="api">
-      <unit bldFile="/sf/mw/drm/drm_pub/group"/>
-     </component>
-     <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/drm/drm_plat/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+<component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component name="wmdrm_ota_access_api" long-name="WMDRM OTA Access API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/wmdrm_ota_access_api/group"/>
+</component>
+<component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+<component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+<unit bldFile="/sf/mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
+<collection name="commondrm" long-name="Common DRM" level="generic">
+<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
+<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
+<unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
+<component name="drmutility" filter="s60" long-name="DRM Utility">
+<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+<!--<unit bldFile="commondrm/drmutility/group"/>-->
+</component>
+<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
+<unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+</component>
+<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
+<unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+</component>
+<component name="commondrm_build" filter="s60" long-name="Common DRM Build">
+<!-- should be split into the above files, or them collapsed into a single component -->
+<unit bldFile="/sf/mw/drm/commondrm/group"/>
+</component>
+</collection>
+<collection name="omadrm" long-name="OMA DRM" level="server">
+<!-- collection is really a component. Move down a directory -->
+<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
+<unit bldFile="/sf/mw/drm/omadrm/group"/>
+</component>
+<component name="foundationcerts" filter="sf_build" long-name="Foundation Certificates">
+<unit bldFile="/sf/mw/drm/omadrm/foundationcerts/group"/>
+</component>
+</collection>
+<collection name="wmdrm" long-name="Windows Media DRM" level="framework">
+<!-- collection is really a component. Move down a directory -->
+<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
+<unit bldFile="/sf/mw/drm/wmdrm/group"/>
+</component>
+</collection>
+<collection name="drm_info" long-name="DRM Info" level="specific"/>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file