--- a/tip_pbc/mw/drm/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/drm/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,109 +50,109 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="drm" level="generic" levels="plugin framework server generic specific" long-name="DRM">
+   <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
 <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-<component name="roap_api" long-name="ROAP API" filter="s60" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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="WM DRM Access API" filter="s60" purpose="optional" class="api">
+<component name="wmdrm_access_api" long-name="WM DRM 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="WM DRM OTA Access API" filter="s60" purpose="optional" class="api">
+<component name="wmdrm_ota_access_api" long-name="WM DRM 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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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" purpose="optional" class="api">
+<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="drmqtencryptor" long-name="DRM Qt Encryptor" introduced="^4" filter="s60" purpose="optional">
+<component name="drmqtencryptor" filter="s60" long-name="DRM Qt Encryptor" introduced="^4">
 <unit bldFile="/sf/mw/drm/commondrm/drmqtencryptor" proFile="qt_drmencryptor.pro" qmakeArgs="-r"/>
 </component>
-<component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" filter="s60" purpose="optional">
+<component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
 <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
 </component>
-<component name="drmutility" long-name="DRM Utility" filter="s60" purpose="optional">
+<component name="drmutility" filter="s60" long-name="DRM Utility">
 <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
 </component>
-<component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" filter="s60" purpose="optional">
+<component name="drmserviceapiwrapper" filter="s60" long-name="DRM Service API Wrapper">
 <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
 </component>
-<component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" filter="s60" purpose="optional">
+<component name="drmrightsstoringlocation" filter="s60" long-name="DRM Rights Storing Location">
 <unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
 </component>
-<component name="commondrm_build" long-name="Common DRM Build" filter="s60" purpose="optional">
+<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>
-<component name="commondrm_qt_build" long-name="Common DRM Qt Build" introduced="^4" filter="s60" purpose="optional">
+<component name="commondrm_qt_build" filter="s60" long-name="Common DRM Qt Build" introduced="^4">
 <!-- split up build components -->
-<unit bldFile="/sf/mw/drm/commondrm" proFile="commondrm.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/mw/drm/commondrm" qmakeArgs="-r" proFile="commondrm.pro"/>
 </component>
 </collection>
 <collection name="omadrm" long-name="OMA DRM" level="server">
 <!-- split up build components -->
-<component name="omadrm_build" long-name="OMA DRM Build" filter="s60" purpose="optional">
+<component name="omadrm_build" filter="s60" long-name="OMA DRM Build">
 <unit bldFile="/sf/mw/drm/omadrm/group"/>
 </component>
-<component name="omadrm_qt_build" long-name="OMA DRM Qt Build" introduced="^4" filter="s60" purpose="optional">
+<component name="omadrm_qt_build" filter="s60" long-name="OMA DRM Qt Build" introduced="^4">
 <unit bldFile="/sf/mw/drm/omadrm" proFile="omadrm.pro"/>
 </component>
-<component name="foundationcerts" long-name="Foundation Certificates" filter="sf_build" purpose="optional">
+<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" long-name="WM DRM Build" filter="s60" purpose="optional">
+<component name="wmdrm_build" filter="s60" long-name="WM DRM Build">
 <unit bldFile="/sf/mw/drm/wmdrm/group"/>
 </component>
 </collection>