--- a/symbian4/os/xmlsrv/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
+++ b/symbian4/os/xmlsrv/package_definition.xml	Wed Jun 30 17:34:43 2010 +0100
@@ -50,25 +50,19 @@
   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" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
-	  Remove this component and uncomment the other units when fixed-->
-<unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
+<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_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+<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_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+<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>
 </collection>
 <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">