diff -r b3cd97947a8a -r a3f2b0422c8b tip_pbc/os/xmlsrv/package_definition.xml
--- a/tip_pbc/os/xmlsrv/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/os/xmlsrv/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,38 +50,38 @@
   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="os" long-name="OS" levels="hw services">
-   <block name="xmlsrv" level="services" levels="plugin server framework generic specific" long-name="XML Services">
+   <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" purpose="optional" class="api">
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
 </component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" purpose="optional" class="api">
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
 </component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" purpose="optional" class="api">
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
 </component>
-<component name="cxml_library_api" long-name="cXml Library API" filter="s60" purpose="optional" class="api">
+<component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/cxml_library_api/group"/>
 </component>
-<component name="xml_parser_api" long-name="XML Parser API" filter="s60" purpose="optional" class="api">
+<component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
 <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_parser_api/group"/>
 </component>
 </collection>
 <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-<component name="xmlseccertman" long-name="XML Security Certificate Manager" filter="s60" purpose="optional">
+<component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
 <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
 </component>
-<component name="xmlsec" long-name="XML Security" filter="s60" purpose="optional">
+<component name="xmlsec" filter="s60" long-name="XML Security">
 <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
 </component>
-<component name="xmlseccrypto" long-name="XML Security Crypto" filter="s60" purpose="optional">
+<component name="xmlseccrypto" filter="s60" long-name="XML Security Crypto">
 <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
 </component>
-<component name="xmlsecwrapper" long-name="XML Security Wrapper" filter="s60" purpose="optional">
+<component name="xmlsecwrapper" filter="s60" long-name="XML Security Wrapper">
 <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
 </component>
 </collection>
@@ -107,10 +107,10 @@
 <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp" filter="!test"/>
 </component>
-<component name="cxmllibrary" long-name="cXml Library" filter="s60" purpose="optional">
+<component name="cxmllibrary" filter="s60" long-name="cXml Library">
 <unit bldFile="/sf/os/xmlsrv/xml/cxmllibrary/group"/>
 </component>
-<component name="xmlparser" long-name="XML Interface" filter="s60" purpose="optional">
+<component name="xmlparser" filter="s60" long-name="XML Interface">
 <unit bldFile="/sf/os/xmlsrv/xml/xmlparser/group"/>
 </component>
 </collection>