# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286150900 -10800
# Node ID c828a2f286d17a1487948c8aee620f41e31dd09c
# Parent  450972dee09630d27a2d4eff798162d0a5d094d1
Revision: 201039
Kit: 201039

diff -r 450972dee096 -r c828a2f286d1 group/bld.inf
--- a/group/bld.inf	Tue Jul 06 16:24:52 2010 +0300
+++ b/group/bld.inf	Mon Oct 04 03:08:20 2010 +0300
@@ -24,10 +24,10 @@
 #include "../extension_makefiles/group/bld.inf"
 #include "../xml/cxmllibrary/group/bld.inf"
 #include "../xml/xmlparser/group/bld.inf"
-#include "../xml/legacyminidomparser/GROUP/bld.inf"
-#include "../xml/xmlfw/GROUP/bld.inf"
+#include "../xml/legacyminidomparser/group/bld.inf"
+#include "../xml/xmlfw/group/bld.inf"
 #include "../xml/libxml2libs/group/bld.inf"
-#include "../xml/xmldomandxpath/GROUP/bld.inf"
+#include "../xml/xmldomandxpath/group/bld.inf"
 #include "../xml/wbxmlparser/group/bld.inf"
 #include "../xml/xmllibxml2parser/group/bld.inf"
 #include "../xml/xmlexpatparser/group/bld.inf"
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>
diff -r 450972dee096 -r c828a2f286d1 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Mon Oct 04 03:08:20 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="os"/>
diff -r 450972dee096 -r c828a2f286d1 xml/legacyminidomparser/GROUP/bld.inf
--- a/xml/legacyminidomparser/GROUP/bld.inf	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/legacyminidomparser/GROUP/bld.inf	Mon Oct 04 03:08:20 2010 +0300
@@ -25,8 +25,8 @@
 DEFAULT
 
 // Subproject builds
-#include "../XMLDom/GROUP/bld.inf"
-#include "../XMLParser/GROUP/bld.inf"
-#include "../Rom/bld.inf"
+#include "../xmldom/group/bld.inf"
+#include "../xmlparser/group/bld.inf"
+#include "../rom/bld.inf"
 
 PRJ_MMPFILES
diff -r 450972dee096 -r c828a2f286d1 xml/legacyminidomparser/XMLDom/GROUP/XMLDOM.mmp
--- a/xml/legacyminidomparser/XMLDom/GROUP/XMLDOM.mmp	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/legacyminidomparser/XMLDom/GROUP/XMLDOM.mmp	Mon Oct 04 03:08:20 2010 +0300
@@ -26,20 +26,20 @@
 UID				0x1000008d 0x101F9117
 VENDORID 0x70000001
 
-SOURCEPATH		../SRC
-SOURCE			GMXMLCDATASection.cpp
-SOURCE			GMXMLCharacterData.cpp
-SOURCE			GMXMLComment.cpp
-SOURCE			GMXMLDocument.cpp
-SOURCE			GMXMLDocumentElement.cpp
-SOURCE			GMXMLElement.cpp
-SOURCE			GMXMLNode.cpp
-SOURCE			GMXMLProcessingInstruction.cpp
-SOURCE			GMXMLText.cpp
+SOURCEPATH		../src
+SOURCE			gmxmlcdatasection.cpp
+SOURCE			gmxmlcharacterdata.cpp
+SOURCE			gmxmlcomment.cpp
+SOURCE			gmxmldocument.cpp
+SOURCE			gmxmldocumentelement.cpp
+SOURCE			gmxmlelement.cpp
+SOURCE			gmxmlnode.cpp
+SOURCE			gmxmlprocessinginstruction.cpp
+SOURCE			gmxmltext.cpp
 
 
 
-USERINCLUDE		../INC
+USERINCLUDE		../inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY				euser.lib
 LIBRARY         	bafl.lib 
diff -r 450972dee096 -r c828a2f286d1 xml/legacyminidomparser/XMLDom/GROUP/bld.inf
--- a/xml/legacyminidomparser/XMLDom/GROUP/bld.inf	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/legacyminidomparser/XMLDom/GROUP/bld.inf	Mon Oct 04 03:08:20 2010 +0300
@@ -17,23 +17,23 @@
     DEFAULT
 	
 PRJ_MMPFILES
-    XMLDOM.mmp
+    xmldom.mmp
     
 
 PRJ_EXPORTS
-    ../INC/GMXMLCDataSection.h 				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcdatasection.h)
-    ../INC/GMXMLCharacterData.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcharacterdata.h)
-    ../INC/GMXMLComment.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcomment.h)
-    ../INC/GMXMLDocument.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmldocument.h)
-    ../INC/GMxmldomconstants.h 				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmldomconstants.h)
-    ../INC/GMXMLDocumentElement.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmldocumentelement.h)
-    ../INC/GMXMLElement.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlelement.h)
-    ../INC/GMXMLNode.h 						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlnode.h)
-    ../INC/GMXMLProcessingInstruction.h 	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlprocessinginstruction.h)
-    ../INC/GMXMLText.h 						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmltext.h)
+    ../inc/gmxmlcdatasection.h 				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcdatasection.h)
+    ../inc/gmxmlcharacterData.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcharacterdata.h)
+    ../inc/gmxmlcomment.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcomment.h)
+    ../inc/gmxmldocument.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmldocument.h)
+    ../inc/gmxmldomconstants.h 				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmldomconstants.h)
+    ../inc/gmxmldocumentelement.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmldocumentelement.h)
+    ../inc/gmxmlelement.h 					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlelement.h)
+    ../inc/gmxmlnode.h 						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlnode.h)
+    ../inc/gmxmlprocessinginstruction.h 	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlprocessinginstruction.h)
+    ../inc/gmxmltext.h 						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmltext.h)
 	#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-	../INC/gmxmldummydtd.h /epoc32/include/gmxmldummydtd.h
+	../inc/gmxmldummydtd.h /epoc32/include/gmxmldummydtd.h
 #endif
 	#endif
 
diff -r 450972dee096 -r c828a2f286d1 xml/legacyminidomparser/XMLParser/GROUP/bld.inf
--- a/xml/legacyminidomparser/XMLParser/GROUP/bld.inf	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/legacyminidomparser/XMLParser/GROUP/bld.inf	Mon Oct 04 03:08:20 2010 +0300
@@ -17,10 +17,10 @@
     DEFAULT
 
 PRJ_EXPORTS
-    ../INC/GMXMLComposer.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcomposer.h)
-    ../INC/GMXMLParser.h 			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmlparser.h)
-    ../INC/GMXMLConstants.h 		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmlconstants.h)
-    ../INC/GMXMLEntityConverter.h 	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlentityconverter.h)
+    ../inc/gmxmlcomposer.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlcomposer.h)
+    ../inc/gmxmlparser.h 			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmlparser.h)
+    ../inc/gmxmlconstants.h 		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(gmxmlconstants.h)
+    ../inc/gmxmlentityconverter.h 	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(gmxmlentityconverter.h)
 
 PRJ_MMPFILES
     xmlparser.mmp
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/group/bld.inf
--- a/xml/xmlparser/group/bld.inf	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/group/bld.inf	Mon Oct 04 03:08:20 2010 +0300
@@ -29,11 +29,11 @@
 // Move the includes into "Public Nokia implemented" in CORE_OS_LAYER_IBY_EXPORT_PATH
 
 
-../rom/Xmlinterface.iby					CORE_OS_LAYER_IBY_EXPORT_PATH(Xmlinterface.iby)
+../rom/xmlinterface.iby					CORE_OS_LAYER_IBY_EXPORT_PATH(xmlinterface.iby)
 
 PRJ_MMPFILES
 
-XMLInterface.mmp
+xmlinterface.mmp
 
 PRJ_TESTMMPFILES
 
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/inc/CXMLAttributes.h
--- a/xml/xmlparser/inc/CXMLAttributes.h	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/inc/CXMLAttributes.h	Mon Oct 04 03:08:20 2010 +0300
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <badesca.h>  
-#include <xml/MXMLAttributes.h>
+#include <xml/mxmlattributes.h>
 
 
 // CLASS DECLARATION
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/inc/CXMLObserver.h
--- a/xml/xmlparser/inc/CXMLObserver.h	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/inc/CXMLObserver.h	Mon Oct 04 03:08:20 2010 +0300
@@ -23,9 +23,9 @@
 //  INCLUDES
 #include <e32std.h>
 #include <txtetext.h>
-#include "CXMLAttributes.h"
-#include <xml/MXMLContentHandler.h>
-#include <xml/MWBXMLContentHandler.h>
+#include "cxmlattributes.h"
+#include <xml/mxmlcontenthandler.h>
+#include <xml/mwbxmlcontenthandler.h>
 
 
 // CLASS DECLARATION
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/inc/CXMLReader.h
--- a/xml/xmlparser/inc/CXMLReader.h	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/inc/CXMLReader.h	Mon Oct 04 03:08:20 2010 +0300
@@ -24,13 +24,13 @@
 #include <e32std.h>
 #include <f32file.h>
 #include <utf.h>
-#include <xml/cxml/nw_cXML_Parser.h>
+#include <xml/cxml/nw_cxml_parser.h>
 
-#include "CXMLAttributes.h"
-#include <xml/MXMLContentHandler.h>
-#include <xml/MWBXMLContentHandler.h>
-#include "CXMLObserver.h"
-#include <xml/XMLUtils.h>
+#include "cxmlattributes.h"
+#include <xml/mxmlcontenthandler.h>
+#include <xml/mwbxmlcontenthandler.h>
+#include "cxmlobserver.h"
+#include <xml/xmlutils.h>
 
 
 // CLASS DECLARATION
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/src/CXMLAttributes.cpp
--- a/xml/xmlparser/src/CXMLAttributes.cpp	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/src/CXMLAttributes.cpp	Mon Oct 04 03:08:20 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include "CXMLAttributes.h"
+#include "cxmlattributes.h"
 
 
 
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/src/CXMLObserver.cpp
--- a/xml/xmlparser/src/CXMLObserver.cpp	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/src/CXMLObserver.cpp	Mon Oct 04 03:08:20 2010 +0300
@@ -17,7 +17,7 @@
 
 
 
-#include "CXMLObserver.h"
+#include "cxmlobserver.h"
 
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/src/CXMLReader.cpp
--- a/xml/xmlparser/src/CXMLReader.cpp	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/src/CXMLReader.cpp	Mon Oct 04 03:08:20 2010 +0300
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include "CXMLReader.h"
+#include "cxmlreader.h"
 
 
 /* Dictionar Public ID's */
diff -r 450972dee096 -r c828a2f286d1 xml/xmlparser/src/RXMLReader.cpp
--- a/xml/xmlparser/src/RXMLReader.cpp	Tue Jul 06 16:24:52 2010 +0300
+++ b/xml/xmlparser/src/RXMLReader.cpp	Mon Oct 04 03:08:20 2010 +0300
@@ -18,8 +18,8 @@
 
 
 // INCLUDE FILES
-#include <xml/RXMLReader.h>
-#include "CXMLReader.h"
+#include <xml/rxmlreader.h>
+#include "cxmlreader.h"