--- a/package_definition.xml	Wed Jun 23 20:27:15 2010 +0530
+++ b/package_definition.xml	Thu Jul 01 15:13:40 2010 +0530
@@ -68,7 +68,13 @@
       <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"/>
       </component>
-    </collection>
+      <component id="cxmllibrary" filter="s60" name="CXML Parser">
+        <unit bldFile="xml/cxmllibrary/group"/>
+      </component>
+      <component id="xmlparser" filter="s60" name="XML Parser">
+        <unit bldFile="xml/xmlparser/group"/>
+      </component>
+      </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"/>

--- a/xml/cxmllibrary/group/cXmlParser.mmp	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/cxmllibrary/group/cXmlParser.mmp	Thu Jul 01 15:13:40 2010 +0530
@@ -23,13 +23,13 @@
 
 #if defined(ARMCC)
 UID	0x1000008D 	0x101F8710
-deffile EABI/cXmlParser.def
+deffile eabi/CXMLPARSER.DEF
 #elif defined( WINSCW )
-deffile Bwinscw/cXmlParser.def
+deffile BWINSCW/CXMLPARSER.DEF
 #elif defined( WINS )
 deffile Bwins/cXmlParser.def
 #else
-deffile Bmarm/cXmlParser.def
+deffile bmarm/CXMLPARSER.DEF
 #endif
 
 CAPABILITY CAP_GENERAL_DLL
@@ -50,7 +50,7 @@
 SOURCE	tinydom/src/tiny_dom_write.c
 SOURCE	tinytree/src/EBuffer.c
 SOURCE	tinytree/src/tree.c
-SOURCE	tinyTree/src/TreeVector.c
+SOURCE	tinytree/src/TreeVector.c
 SOURCE	wbxmlp/src/dictionary.c
 SOURCE	wbxmlp/src/DictionaryContext.cpp
 SOURCE	wbxmlp/src/doc.c
@@ -69,7 +69,7 @@
 SOURCE  utils/src/cxml_mem.c
 SOURCE  utils/src/cxml_vector.c
 SOURCE  utils/src/cxml_str.c
-SOURCE  utils/src/E32XMLPARSERDLLEntryPoint.cpp
+SOURCE  utils/src/E32XMLParserDllEntryPoint.cpp
 SOURCE  utils/src/cxml_file_if.cpp
 
 

--- a/xml/cxmllibrary/src/utils/src/cxml_file_if.cpp	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/cxmllibrary/src/utils/src/cxml_file_if.cpp	Thu Jul 01 15:13:40 2010 +0530
@@ -17,7 +17,7 @@
 
 
 
-#include <F32File.h>
+#include <f32file.h>
 #include <xml/cxml/cxml_file_if.h>
 #include <xml/cxml/nw_string_char.h>
 

--- a/xml/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp	Thu Jul 01 15:13:40 2010 +0530
@@ -17,7 +17,7 @@
 #include <e32std.h>
 #include "DictionaryContext.h"
 #include "cxml_internal.h"
-#include "FeatMgr.h"
+#include "featmgr.h"
 #include <xml/cxml/nw_wbxml_dictionary.h>
 
 /* There is possibility that dictionary initialize is called by the embedded

--- a/xml/legacyminidomparser/Rom/bld.inf	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/legacyminidomparser/Rom/bld.inf	Thu Jul 01 15:13:40 2010 +0530
@@ -19,7 +19,3 @@
 
 ../Rom/legacyminidomparser.iby /epoc32/rom/include/legacyminidomparser.iby
 
-PRJ_TESTEXPORTS
-
-../Rom/legacyminidomparsertest.iby /epoc32/rom/include/legacyminidomparsertest.iby
-

--- a/xml/legacyminidomparser/Rom/legacyminidomparsertest.iby	Wed Jun 23 20:27:15 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __LEGACYMINIDOMPARSERTEST_IBY__
-#define __LEGACYMINIDOMPARSERTEST_IBY__
-
-#include <legacyminidomparser.iby>
-
-file=ABI_DIR\BUILD_DIR\t_gmxmlparser.exe	sys\bin\t_gmxmlparser.exe
-file=ABI_DIR\BUILD_DIR\t_gmxmlfailure.exe	sys\bin\t_gmxmlfailure.exe
-
-file=ABI_DIR\BUILD_DIR\t_smiltranslatortest.exe  sys\bin\t_smiltranslatortest.exe 
-
-
-#endif

--- a/xml/legacyminidomparser/XMLParser/test/group/bld.inf	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/legacyminidomparser/XMLParser/test/group/bld.inf	Thu Jul 01 15:13:40 2010 +0530
@@ -23,7 +23,7 @@
 
 PRJ_TESTEXPORTS
 ../GmxmlTest.txt c:/gmxmltest.txt
-
+legacyminidomparsertest.iby /epoc32/rom/include/legacyminidomparsertest.iby
 
 
 // SMIL Input valid

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/legacyminidomparser/XMLParser/test/group/legacyminidomparsertest.iby	Thu Jul 01 15:13:40 2010 +0530
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __LEGACYMINIDOMPARSERTEST_IBY__
+#define __LEGACYMINIDOMPARSERTEST_IBY__
+
+#include <legacyminidomparser.iby>
+
+file=ABI_DIR\BUILD_DIR\t_gmxmlparser.exe	sys\bin\t_gmxmlparser.exe
+file=ABI_DIR\BUILD_DIR\t_gmxmlfailure.exe	sys\bin\t_gmxmlfailure.exe
+
+file=ABI_DIR\BUILD_DIR\t_smiltranslatortest.exe  sys\bin\t_smiltranslatortest.exe 
+
+
+#endif

--- a/xml/libxml2libs/inc/libxml2/libxml2_chvalid.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/libxml2libs/inc/libxml2/libxml2_chvalid.h	Thu Jul 01 15:13:40 2010 +0530
@@ -24,7 +24,7 @@
 
 #pragma warning(disable: 4127 4132 4510 4512 4610)
 
-#include "libxml2_xmlstring.h"
+#include <stdapis/libxml2/libxml2_xmlstring.h>
 
 #ifdef __cplusplus
 extern "C" {

--- a/xml/libxml2libs/inc/libxml2/libxml2_dict.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/libxml2libs/inc/libxml2/libxml2_dict.h	Thu Jul 01 15:13:40 2010 +0530
@@ -17,7 +17,7 @@
 #ifndef XML_DICT_H
 #define XML_DICT_H
 
-#include "libxml2_xmlstring.h"
+#include <stdapis/libxml2/libxml2_xmlstring.h>
 
 #ifdef __cplusplus
 extern "C" {

--- a/xml/libxml2libs/inc/libxml2/libxml2_encoding.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/libxml2libs/inc/libxml2/libxml2_encoding.h	Thu Jul 01 15:13:40 2010 +0530
@@ -29,7 +29,7 @@
 #define XML_CHAR_ENCODING_H
 
 //#include "libxml/Libxml2_xmlversion.h" // enable this when dependency on tree.h is removed
-#include "libxml2_tree.h"
+#include <stdapis/libxml2/libxml2_tree.h>
 
 #ifdef LIBXML_ICONV_ENABLED
 #include <iconv.h>

--- a/xml/libxml2libs/inc/libxml2/libxml2_globals.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/libxml2libs/inc/libxml2/libxml2_globals.h	Thu Jul 01 15:13:40 2010 +0530
@@ -124,9 +124,9 @@
 XMLPUBFUN void* XMLCALL realloc_impl(void *ptr, size_t size);
 
 #ifdef LIBXML_XPATH_ENABLED
-#   include "xmlengtriodef.h"
-#   include "xmlengtrionan.h"
-#   include "libxml2_xpathinternals.h"
+#include <stdapis/libxml2/xmlengtriodef.h>
+#include <stdapis/libxml2/xmlengtrionan.h>
+#include <stdapis/libxml2/libxml2_xpathinternals.h>
 #endif
 
 #ifdef LIBXML_CATALOG_ENABLED

--- a/xml/xmlparser/bwinscw/xmlinterfaceu.def	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/bwinscw/xmlinterfaceu.def	Thu Jul 01 15:13:40 2010 +0530
@@ -1,12 +1,12 @@
 EXPORTS
-	?SetContentHandler@RXMLReader@@QAEHPAVMXMLContentHandler@@@Z @ 1 NONAME ; int RXMLReader::SetContentHandler(class MXMLContentHandler *)
-	?ParseL@RXMLReader@@QAEXAAVRFs@@ABVTDesC16@@@Z @ 2 NONAME ; void RXMLReader::ParseL(class RFs &, class TDesC16 const &)
-	?ParseL@RXMLReader@@QAEXAAVRFile@@@Z @ 3 NONAME ; void RXMLReader::ParseL(class RFile &)
-	?ParseL@RXMLReader@@QAEXABVTDesC8@@@Z @ 4 NONAME ; void RXMLReader::ParseL(class TDesC8 const &)
-	?Close@RXMLReader@@QAEXXZ @ 5 NONAME ; void RXMLReader::Close(void)
-	?SetFeature@RXMLReader@@QAEHW4TXMLFeature@@H@Z @ 6 NONAME ; int RXMLReader::SetFeature(enum TXMLFeature, int)
-	?SetContentHandler@RXMLReader@@QAEHPAVMWBXMLContentHandler@@@Z @ 7 NONAME ; int RXMLReader::SetContentHandler(class MWBXMLContentHandler *)
-	?Destroy@RXMLReader@@QAEXXZ @ 8 NONAME ; void RXMLReader::Destroy(void)
-	?GetFeature@RXMLReader@@QAEHW4TXMLFeature@@AAH@Z @ 9 NONAME ; int RXMLReader::GetFeature(enum TXMLFeature, int &)
-	?CreateL@RXMLReader@@QAEXXZ @ 10 NONAME ; void RXMLReader::CreateL(void)
+	?Close@RXMLReader@@QAEXXZ @ 1 NONAME ; void RXMLReader::Close(void)
+	?CreateL@RXMLReader@@QAEXXZ @ 2 NONAME ; void RXMLReader::CreateL(void)
+	?Destroy@RXMLReader@@QAEXXZ @ 3 NONAME ; void RXMLReader::Destroy(void)
+	?GetFeature@RXMLReader@@QAEHW4TXMLFeature@@AAH@Z @ 4 NONAME ; int RXMLReader::GetFeature(enum TXMLFeature, int &)
+	?ParseL@RXMLReader@@QAEXAAVRFile@@@Z @ 5 NONAME ; void RXMLReader::ParseL(class RFile &)
+	?ParseL@RXMLReader@@QAEXAAVRFs@@ABVTDesC16@@@Z @ 6 NONAME ; void RXMLReader::ParseL(class RFs &, class TDesC16 const &)
+	?ParseL@RXMLReader@@QAEXABVTDesC8@@@Z @ 7 NONAME ; void RXMLReader::ParseL(class TDesC8 const &)
+	?SetContentHandler@RXMLReader@@QAEHPAVMWBXMLContentHandler@@@Z @ 8 NONAME ; int RXMLReader::SetContentHandler(class MWBXMLContentHandler *)
+	?SetContentHandler@RXMLReader@@QAEHPAVMXMLContentHandler@@@Z @ 9 NONAME ; int RXMLReader::SetContentHandler(class MXMLContentHandler *)
+	?SetFeature@RXMLReader@@QAEHW4TXMLFeature@@H@Z @ 10 NONAME ; int RXMLReader::SetFeature(enum TXMLFeature, int)
 

--- a/xml/xmlparser/eabi/xmlinterfaceu.def	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/eabi/xmlinterfaceu.def	Thu Jul 01 15:13:40 2010 +0530
@@ -9,10 +9,8 @@
 	_ZN10RXMLReader6ParseLERK6TDesC8 @ 8 NONAME
 	_ZN10RXMLReader7CreateLEv @ 9 NONAME
 	_ZN10RXMLReader7DestroyEv @ 10 NONAME
-	_ZTI10CXMLReader @ 11 NONAME
-	_ZTI12CXMLObserver @ 12 NONAME
-	_ZTI14CXMLAttributes @ 13 NONAME
-	_ZTV10CXMLReader @ 14 NONAME
-	_ZTV12CXMLObserver @ 15 NONAME
-	_ZTV14CXMLAttributes @ 16 NONAME
+	_ZTI12CXMLObserver @ 11 NONAME ; #<TI>#
+	_ZTI14CXMLAttributes @ 12 NONAME ; #<TI>#
+	_ZTV12CXMLObserver @ 13 NONAME ; #<VT>#
+	_ZTV14CXMLAttributes @ 14 NONAME ; #<VT>#
 

--- a/xml/xmlparser/group/XMLInterface.mmp	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/group/XMLInterface.mmp	Thu Jul 01 15:13:40 2010 +0530
@@ -35,7 +35,7 @@
   DEFFILE     ../bmarm/xmlinterface.def
 #endif
 
-SOURCEPATH 	../SRC	
+SOURCEPATH 	../src	
 SOURCE          RXMLReader.cpp
 SOURCE          wml_1_3_dict.c
 SOURCE          syncml_1_0_dict.c
@@ -48,7 +48,7 @@
 // RESOURCE        resource_file
 // RESOURCE        resource_file2
 
-USERINCLUDE     ../INC
+USERINCLUDE     ../inc
 
 OS_LAYER_SYSTEMINCLUDE
 OS_LAYER_LIBC_SYSTEMINCLUDE

--- a/xml/xmlparser/inc/CXMLAttributes.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/inc/CXMLAttributes.h	Thu Jul 01 15:13:40 2010 +0530
@@ -22,7 +22,6 @@
 
 //  INCLUDES
 #include <e32std.h>
-//#include <eikenv.h>  
 #include <badesca.h>  
 #include <xml/MXMLAttributes.h>
 

--- a/xml/xmlparser/inc/CXMLObserver.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/inc/CXMLObserver.h	Thu Jul 01 15:13:40 2010 +0530
@@ -22,9 +22,7 @@
 
 //  INCLUDES
 #include <e32std.h>
-//#include <eikenv.h>
-#include <badesca.h>  
-#include <txtetext.h>  
+#include <txtetext.h>
 #include "CXMLAttributes.h"
 #include <xml/MXMLContentHandler.h>
 #include <xml/MWBXMLContentHandler.h>

--- a/xml/xmlparser/inc/CXMLReader.h	Wed Jun 23 20:27:15 2010 +0530
+++ b/xml/xmlparser/inc/CXMLReader.h	Thu Jul 01 15:13:40 2010 +0530
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32std.h>
-#include <F32File.h>
+#include <f32file.h>
 #include <utf.h>
 #include <xml/cxml/nw_cXML_Parser.h>