diff -r 450972dee096 -r c828a2f286d1 package_definition.xml
--- a/package_definition.xml	Tue Jul 06 16:24:52 2010 +0300
+++ b/package_definition.xml	Mon Oct 04 03:08:20 2010 +0300
@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
-    <collection id="xmlengine" name="XML Engine" level="server">
-      <component id="libxml2" filter="s60" name="Libxml2" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <unit bldFile="xmlengine/libxml2/group"/>
+    <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+      <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+        <meta rel="Api" href="xmlsrv_plat/xml_encryption_api/xml_encryption_api.metaxml"/>
+        <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/>
       </component>
-      <component id="xmlengineutils" filter="s60" name="XML Engine Utils" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <unit bldFile="xmlengine/xmlengineutils/group"/>
-      </component>
-      <component id="domxpathwrapper" filter="s60" name="DOM XPath Wrapper" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <unit bldFile="xmlengine/domxpathwrapper/group"/>
+      <component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+        <meta rel="Api" href="xmlsrv_plat/xml_signature_api/xml_signature_api.metaxml"/>
+        <unit bldFile="xmlsrv_plat/xml_signature_api/group"/>
       </component>
-      <component id="xmlengineserializer" filter="s60" name="XML Engines Serializer" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <unit bldFile="xmlengine/xmlengineserializer/group"/>
+      <component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+        <meta rel="Api" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
+        <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/>
       </component>
-      <component id="xmlenginesaxplugin" filter="s60" name="XML Engine SAX Plugin" class="plugin" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <unit bldFile="xmlengine/xmlenginesaxplugin/group"/>
-      </component>
-      <component id="xmlengine_build" filter="s60" name="XML Engine Build" deprecated="^3">
-		<!-- deprecated due to duplication -->
-        <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
-        <unit bldFile="xmlengine/group"/>
-      </component>
+	   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+		<meta rel="Api" href="xmlsrv_plat/cxml_library_api/cxml_library_api.metaxml"/>
+		<unit bldFile="xmlsrv_plat/cxml_library_api/group"/>
+	   </component>
+	   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+		<meta rel="Api" href="xmlsrv_plat/xml_parser_api/xml_parser_api.metaxml"/>
+		<unit bldFile="xmlsrv_plat/xml_parser_api/group"/>
+	   </component>
     </collection>
     <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
       <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
@@ -41,58 +36,72 @@
       <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
         <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
       </component>
-      <component id="xmlsecurityengine_build" filter="s60" name="XML Security Engine Build">
-        <!-- can the hrh #include be moved to the appropriate other bld.infs? -->
-        <unit bldFile="xmlsecurityengine/group"/>
-      </component>
     </collection>
     <collection id="xml" name="XML" level="generic">
       <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
-        <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp" filter="!test"/>
+        <unit bldFile="xml/xmlfw/test/rtest/group" filter="test,api_test"/>
       </component>
       <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
-        <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp" filter="!test"/>
+        <unit bldFile="xml/libxml2libs/test" filter="test,api_test"/>
       </component>
-       <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-     <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" /> 
+      <component id="libxml2libs_test" name="Libxml2 Libraries STIF Tests" introduced="^3" purpose="development" filter="test,api_test">
+        <!-- can't have a component live under another component. Need to move to a new directory -->
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_stif"/>
+        </meta>
+        <unit bldFile="xml/libxml2libs/test/xmlengtester/xmlengtester_target/group"/>
+      </component>
+      <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" filter="!test"/>
+        <unit bldFile="xml/legacyminidomparser/XMLParser/test/group" filter="test,api_test"/>
       </component>
       <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
-        <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp" filter="!test"/>
+        <unit bldFile="xml/xmldomandxpath/test/tef/group" filter="test,api_test"/>
       </component>
       <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp" filter="!test"/>
+        <unit bldFile="xml/xmlexpatparser/test/rtest/group" filter="test,api_test"/>
       </component>
       <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_tef"/>
+        </meta>
+        <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp" filter="!test"/>
+        <unit bldFile="xml/xmllibxml2parser/test/tef/xmlparser2/group" filter="test,api_test"/>
       </component>
       <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+        <meta rel="testbuild">
+          <group name="xmlsrv_test_rtest"/>
+        </meta>
+        <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp" filter="!test"/>
+        <unit bldFile="xml/wbxmlparser/test/rtest/group" filter="test,api_test"/>
       </component>
-      <component id="cxmllibrary" filter="s60" name="CXML Parser">
+      <component id="cxmllibrary" filter="s60" name="cXml Library">
         <unit bldFile="xml/cxmllibrary/group"/>
       </component>
-      <component id="xmlparser" filter="s60" name="XML Parser">
+      <component id="xmlparser" filter="s60" name="XML Interface">
         <unit bldFile="xml/xmlparser/group"/>
       </component>
-      </collection>
+    </collection>
     <collection id="xmlsrv_info" name="XML Services Info" level="specific">
-      <component id="xmlsrv_plat" filter="s60" name="XML Services Platform Interfaces" class="api">
-        <unit bldFile="xmlsrv_plat/group"/>
-        <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-        <!-- <unit bldFile="xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-        <!-- <unit bldFile="xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-        <!-- <unit bldFile="xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-        <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-        <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-      </component>
-      <component id="xmlsrv_build" filter="s60" name="XML Services Build">
-        <!-- move ifdef into appropriate bld.inf -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="xmlsrv_pub" filter="s60" name="XML Services Public Interfaces" class="api">
-        <unit bldFile="xmlsrv_pub/group"/>
-        <!-- <unit bldFile="xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
-      </component>
       <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
       </component>