--- a/extension_makefiles/test/xml_sitestfiledist.mk	Mon May 03 14:14:40 2010 +0300
+++ b/extension_makefiles/test/xml_sitestfiledist.mk	Wed Jun 23 20:27:15 2010 +0530
@@ -31,7 +31,7 @@
 	DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/serviceindication
 endif
 
-SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/serviceindication
+SOURCE_DIR = $(EXTENSION_ROOT)/../data/serviceindication
 
 # Ensure we have a clean canvas - this also avoids us having to specify
 # switches to commands that are not recognised across platforms.

--- a/extension_makefiles/test/xml_stringdictionary00tagtable.mk	Mon May 03 14:14:40 2010 +0300
+++ b/extension_makefiles/test/xml_stringdictionary00tagtable.mk	Wed Jun 23 20:27:15 2010 +0530
@@ -22,9 +22,9 @@
 
 GENERATED_FILES = $(BUILD_DIR)/t_stringdictionary00tagtable.cpp
 
-$(BUILD_DIR)/t_stringdictionary00tagtable.cpp : $(EXTENSION_ROOT)/../test/rtest/tsrc/t_stringdictionary00tagtable.st
+$(BUILD_DIR)/t_stringdictionary00tagtable.cpp : $(EXTENSION_ROOT)/../tsrc/t_stringdictionary00tagtable.st
 	$(call createdir,$(BUILD_DIR))
-	@perl $(EPOCROOT)epoc32/tools/ecopyfile.pl $(EXTENSION_ROOT)/../test/rtest/tsrc/t_stringdictionary00tagtable.st $(BUILD_DIR)$/t_stringdictionary00tagtable.st
+	@perl $(EPOCROOT)epoc32/tools/ecopyfile.pl $(EXTENSION_ROOT)/../tsrc/t_stringdictionary00tagtable.st $(BUILD_DIR)$/t_stringdictionary00tagtable.st
 	@perl $(EPOCROOT)epoc32/tools/stringtable.pl $(BUILD_DIR)/t_stringdictionary00tagtable.st 
 
 DO_NOTHING:

--- a/extension_makefiles/test/xml_syncmltestfiledist.mk	Mon May 03 14:14:40 2010 +0300
+++ b/extension_makefiles/test/xml_syncmltestfiledist.mk	Wed Jun 23 20:27:15 2010 +0530
@@ -31,7 +31,7 @@
 	DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/syncml
 endif
 
-SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/syncml
+SOURCE_DIR = $(EXTENSION_ROOT)/../data/syncml
 
 # Ensure we have a clean canvas - this also avoids us having to specify
 # switches to commands that are not recognised across platforms.

--- a/extension_makefiles/test/xml_wmltestfiledist.mk	Mon May 03 14:14:40 2010 +0300
+++ b/extension_makefiles/test/xml_wmltestfiledist.mk	Wed Jun 23 20:27:15 2010 +0530
@@ -31,7 +31,7 @@
 	DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/wml
 endif
 
-SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/Wml
+SOURCE_DIR = $(EXTENSION_ROOT)/../data/Wml
 
 # Ensure we have a clean canvas - this also avoids us having to specify
 # switches to commands that are not recognised across platforms.

--- a/group/bld.inf	Mon May 03 14:14:40 2010 +0300
+++ b/group/bld.inf	Wed Jun 23 20:27:15 2010 +0530
@@ -14,11 +14,23 @@
 * Description:       Build information file for xmlsrv package
 *
 */
-
+PRJ_PLATFORMS
+DEFAULT
 
 #include "../inc/xmlsrv.hrh"
 
 #include "../xmlsrv_plat/group/bld.inf"
+
+#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/libxml2libs/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"
+
 #include "../xmlsecurityengine/group/bld.inf"
 
-#include "../extension_makefiles/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/xml.pkg	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,118 @@
+;
+; 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:
+;
+;
+; Installation file for STIF
+;
+
+; Languages
+&EN
+
+; Provide value for uid
+#{"XmlTest"},(0x00000000),1,0,0,TYPE=SA
+
+; Series60 product id for S60 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+; Logo
+; None
+
+; Package signature - Optional
+; None
+
+; Start of Package body
+
+; Condition blocks
+; None
+
+; Options list
+; None
+
+; Install files
+;Test exes
+"\epoc32\release\armv5\urel\t_gmxmlparser.exe"	 -   "c:\Sys\Bin\t_gmxmlparser.exe"
+"\epoc32\release\armv5\urel\t_gmxmlfailure.exe"	 -   "c:\Sys\Bin\t_gmxmlfailure.exe"
+"\epoc32\release\armv5\urel\t_smiltranslatortest.exe"	 -   "c:\Sys\Bin\t_smiltranslatortest.exe"
+"\epoc32\release\armv5\urel\te_XML_FTmgrSuite.exe"	 -   "c:\Sys\Bin\te_XML_FTmgrSuite.exe"
+"\epoc32\release\armv5\urel\def130695_Suite.exe"	 -   "c:\Sys\Bin\def130695_Suite.exe" 
+"\epoc32\release\armv5\urel\texml2.exe"	 -   "c:\Sys\Bin\texml2.exe" 
+"\epoc32\release\armv5\urel\t_wbxmlsyncmlparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmlsyncmlparserstabilitytests.exe" 
+"\epoc32\release\armv5\urel\t_wbxmlwmlparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmlwmlparserstabilitytests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlsiparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmlsiparserstabilitytests.exe"
+"\epoc32\release\armv5\urel\t_wbxmloomsyncmlparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmloomsyncmlparserstabilitytests.exe"
+"\epoc32\release\armv5\urel\t_wbxmloomwmlparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmloomwmlparserstabilitytests.exe"
+"\epoc32\release\armv5\urel\t_wbxmloomsiparserstabilitytests.exe"	 -   "c:\Sys\Bin\t_wbxmloomsiparserstabilitytests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlparsertests.exe"	 -   "c:\Sys\Bin\t_wbxmlparsertests.exe"
+"\epoc32\release\armv5\urel\t_wbxmloomparsertests.exe"	 -   "c:\Sys\Bin\t_wbxmloomparsertests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlcorruptparsertests.exe"	 -   "c:\Sys\Bin\t_wbxmlcorruptparsertests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlunknownparsertests.exe"	 -   "c:\Sys\Bin\t_wbxmlunknownparsertests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlbehaviourparsertests.exe"	 -   "c:\Sys\Bin\t_wbxmlbehaviourparsertests.exe"
+"\epoc32\release\armv5\urel\t_wbxmlparserucs4testspartone.exe"	 -   "c:\Sys\Bin\t_wbxmlparserucs4testspartone.exe"
+"\epoc32\release\armv5\urel\t_wbxmldefects.exe"	 -   "c:\Sys\Bin\t_wbxmldefects.exe"
+"\epoc32\release\armv5\urel\xmlengdom_tef.exe"	 -   "c:\Sys\Bin\xmlengdom_tef.exe"
+"\epoc32\release\armv5\urel\xmlengdomnodeset_tef.exe"	 -   "c:\Sys\Bin\xmlengdomnodeset_tef.exe"
+"\epoc32\release\armv5\urel\xmlengdomutils_tef.exe"	 -   "c:\Sys\Bin\xmlengdomutils_tef.exe"
+"\epoc32\release\armv5\urel\xmlengxpathutils_tef.exe"	 -   "c:\Sys\Bin\xmlengxpathutils_tef.exe"
+"\epoc32\release\armv5\urel\t_xmlparser.exe"	 -   "c:\Sys\Bin\t_xmlparser.exe"
+"\epoc32\release\armv5\urel\t_xmlparserheap.exe"	 -   "c:\Sys\Bin\t_xmlparserheap.exe"
+"\epoc32\release\armv5\urel\t_xmldefect.exe"	 -   "c:\Sys\Bin\t_xmldefect.exe"
+"\epoc32\release\armv5\urel\tc_xmlcustomresolvercomptests.exe"	 -   "c:\Sys\Bin\tc_xmlcustomresolvercomptests.exe"
+"\epoc32\release\armv5\urel\t_xmlcore.exe"	 -   "c:\Sys\Bin\t_xmlcore.exe"
+"\epoc32\release\armv5\urel\t_xmlmisc.exe"	 -   "c:\Sys\Bin\t_xmlmisc.exe"
+"\epoc32\release\armv5\urel\tp_xmlframeworkperftests.exe"	 -   "c:\Sys\Bin\tp_xmlframeworkperftests.exe"
+"\epoc32\release\armv5\urel\tu_xmlcmatchdataunittests.exe"	 -   "c:\Sys\Bin\tu_xmlcmatchdataunittests.exe"                   
+"\epoc32\release\armv5\urel\t_xmlprocessfilemancopyfile.exe"	 -   "c:\Sys\Bin\t_xmlprocessfilemancopyfile.exe"
+"\epoc32\release\armv5\urel\t_parserucs4test.exe"	 -   "c:\Sys\Bin\t_parserucs4test.exe"
+"\epoc32\release\armv5\urel\texmlparser2.exe"	 -   "c:\Sys\Bin\texmlparser2.exe"
+
+; Test DLL's
+"\epoc32\release\armv5\urel\xmlengtester.dll"	 -   "c:\Sys\Bin\xmlengtester.dll" 
+
+;ECOM PLUGINS
+"\epoc32\release\armv5\urel\t_testxmlparserplugin1.dll" - "c:\Sys\Bin\t_testxmlparserplugin1.dll"
+"\epoc32\data\Z\Resource\Plugins\t_testxmlparserplugin1.RSC" - "c:\Resource\Plugins\t_testxmlparserplugin1.RSC"
+"\epoc32\release\armv5\urel\t_testxmlparserplugin2.dll" - "c:\Sys\Bin\t_testxmlparserplugin2.dll"
+"\epoc32\data\Z\Resource\Plugins\t_testxmlparserplugin2.RSC" - "c:\Resource\Plugins\t_testxmlparserplugin2.RSC"
+"\epoc32\release\armv5\urel\tu_xmlramparserplugins.dll" - "c:\Sys\Bin\tu_xmlramparserplugins.dll"
+"\epoc32\data\Z\Resource\Plugins\tu_xmlramparserplugins.RSC" - "c:\Resource\Plugins\tu_xmlramparserplugins.RSC"
+"\epoc32\release\armv5\urel\t_validator.dll" - "c:\Sys\Bin\t_validator.dll"
+"\epoc32\data\Z\Resource\Plugins\t_validator.RSC" - "c:\Resource\Plugins\t_validator.RSC"
+"\epoc32\release\armv5\urel\t_parser.dll" - "c:\Sys\Bin\t_parser.dll"
+"\epoc32\data\Z\Resource\Plugins\t_parser.RSC" - "c:\Resource\Plugins\t_parser.RSC"
+"\epoc32\release\armv5\urel\t_stringdictionary00.dll" - "c:\Sys\Bin\t_stringdictionary00.dll"
+"\epoc32\data\Z\Resource\Plugins\t_stringdictionary00.RSC" - "c:\Resource\Plugins\t_stringdictionary00.RSC"
+"\epoc32\release\armv5\urel\tu_xmlromparserplugins.dll" - "c:\Sys\Bin\tu_xmlromparserplugins.dll"
+"\epoc32\data\Z\Resource\Plugins\tu_xmlromparserplugins.RSC" - "c:\Resource\Plugins\tu_xmlromparserplugins.RSC"
+"\epoc32\release\armv5\urel\tetestcontentprocessor.dll" - "c:\Sys\Bin\tetestcontentprocessor.dll"
+"\epoc32\data\Z\Resource\Plugins\tetestcontentprocessor.RSC" - "c:\Resource\Plugins\tetestcontentprocessor.RSC"
+"\epoc32\release\armv5\urel\wml1_1stringdictionary255.dll" - "c:\Sys\Bin\wml1_1stringdictionary255.dll"
+"\epoc32\data\Z\Resource\Plugins\wml1_1stringdictionary255.RSC" - "c:\Resource\Plugins\wml1_1stringdictionary255.RSC"
+
+;Scripts
+"\epoc32\data\z\tef_xml2\xmlparser2tefsuite.script" - "c:\tef_xml2\xmlparser2tefsuite.script"
+"\epoc32\data\z\xmlengdom_tef\xmlengxpathutilstestsuite.script" - "c:\xmlengdom_tef\xmlengxpathutilstestsuite.script"
+"\epoc32\data\z\xmlengdom_tef\xmlengdomutiltefsuite.script" - "c:\xmlengdom_tef\xmlengdomutiltefsuite.script"
+"\epoc32\data\z\xmlengdom_tef\xmlengdomnodetesttefsuite.script" - "c:\xmlengdom_tef\xmlengdomnodetesttefsuite.script"
+"\epoc32\data\z\xmlengdom_tef\xmlengdomtefsuite.script" - "c:\xmlengdom_tef\xmlengdomtefsuite.script"
+"\epoc32\data\z\tef_xml2\xml2tefsuite.script" - "c:\tef_xml2\xml2tefsuite.script"
+"\epoc32\data\z\xml\scripts\xmlengutilssmoketest.script" - "c:\xml\scripts\xmlengutilssmoketest.script"
+"\epoc32\data\z\testdata\scripts\def130695_Suite.script" - "c:\testdata\scripts\def130695_Suite.script"
+"\epoc32\data\z\testdata\scripts\te_xml_ftmgrsuite.script" - "c:\testdata\scripts\te_xml_ftmgrsuite.script"
\ No newline at end of file

--- a/layers.sysdef.xml	Mon May 03 14:14:40 2010 +0300
+++ b/layers.sysdef.xml	Wed Jun 23 20:27:15 2010 +0530
@@ -10,5 +10,27 @@
         <unit unitID="WSDo.xmlsrv" mrp="" bldFile="&layer_real_source_path;/group" name="xmlsrv" />
       </module>
     </layer>
+
+   <layer name="api_test_layer">
+     <module name="xmlsrv_test_rtest">
+        <unit unitID="WSDo.xmlsrv_test_rtest1" mrp="" bldFile="&layer_real_source_path;/xml/legacyminidomparser/XMLParser/test/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_rtest2" mrp="" bldFile="&layer_real_source_path;/xml/wbxmlparser/test/rtest/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_rtest3" mrp="" bldFile="&layer_real_source_path;/xml/xmlexpatparser/test/rtest/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_rtest4" mrp="" bldFile="&layer_real_source_path;/xml/xmlfw/test/rtest/group" name="xmlsrv" />
+		 </module>
+		 <module name="xmlsrv_test_tef">
+        <unit unitID="WSDo.xmlsrv_test_tef1" mrp="" bldFile="&layer_real_source_path;/xml/libxml2libs/test/common/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef2" mrp="" bldFile="&layer_real_source_path;/xml/libxml2libs/test/tef/def130695/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef3" mrp="" bldFile="&layer_real_source_path;/xml/libxml2libs/test/tef/xml2/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef4" mrp="" bldFile="&layer_real_source_path;/xml/xmldomandxpath/test/tef/xmlengdom_tef/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef5" mrp="" bldFile="&layer_real_source_path;/xml/xmldomandxpath/test/tef/xmlengdomnodeset_tef/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef6" mrp="" bldFile="&layer_real_source_path;/xml/xmldomandxpath/test/tef/xmlengdomutils_tef/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef7" mrp="" bldFile="&layer_real_source_path;/xml/xmldomandxpath/test/tef/xmlengxpathutils_tef/group" name="xmlsrv" />
+        <unit unitID="WSDo.xmlsrv_test_tef8" mrp="" bldFile="&layer_real_source_path;/xml/xmllibxml2parser/test/tef/xmlparser2/group" name="xmlsrv" />
+		 </module>
+		 <module name="xmlsrv_test_stif">
+        <unit unitID="WSDo.xmlsrv_test_stif1" mrp="" bldFile="&layer_real_source_path;/xml/libxml2libs/test/xmlengtester/xmlengtester_target/group" name="xmlsrv" />
+		 </module>
+	</layer>
   </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/channel_1.1.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,45 @@
+#
+# Dictionary for the WTA "Channel" content type; 
+#
+# Specification version = 1.2
+#
+######################################################
+#
+# dictionary name
+#
+channel
+#
+# Public id for WML 1.2
+#
+8
+#
+# Doc type for WML 1.2
+#
+-//WAPFORUM//DTD CHANNEL 1.1//EN
+#
+# Tag table - all are in code page 0
+#
+TAGS_FOR_CODE_PAGE 0
+0x05 channel
+0x06 title
+0x07 abstract
+0x08 resource
+#
+# Attribute table - all are in code page 0
+#
+ATTRIBUTES_FOR_CODE_PAGE 0
+0x05	maxspace
+0x06	base
+0x07	href
+0x08	href=http://
+0x09	href=https://
+0x0A	lastmod
+0x0B	etag
+0x0C	md5
+0x0D	success
+0x0E	success=http://
+0x0F	success=https://
+0x10	failure
+0x11	failure=http://
+0x12	failure=https://
+0x13	EventId

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/dict_creator.c	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,1051 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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:   
+* Author:       Frank Richichi
+* Created:      Thu Apr 25 10:34:06 2002
+* Modified:     Thu Apr 25 11:12:35 2002 (Frank Richichi) richichi@D5250215
+* Language:     C
+* Subsystem:    N/A
+* RCS:          $Id$
+*
+*/
+
+
+/* ****************************************************************
+**          Copyright 2000 - Nokia Corporation  All rights reserved.
+**          Nokia Americas
+**          6000 Connection Drive
+**          Irving, Texas 75039
+**
+**          Restricted Rights: Use, duplication, or disclosure by the
+**          U.S. Government is subject to restrictions as set forth in
+**          subparagraph (c)(1)(ii) of DFARS 252.227-7013, or in FAR
+**          52.227-19, or in FAR 52.227-14 Alt. III, as applicable.
+**
+**          This software is proprietary to and embodies the confidential
+**          technology of Nokia  Possession, use, or copying of this software 
+**          and media is authorized only pursuant to a valid written license
+**          from Nokia or an authorized sublicensor.
+**
+**          Nokia  - Wireless Software Solutions
+*****************************************************************/
+
+#include <stdio.h>
+#include <io.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <time.h>
+
+
+/* ----------------------------------------------------------------------- **
+   The following strings are used to identify the beginning of a tag or 
+   attribute list in the input file.
+** ----------------------------------------------------------------------- **/
+
+#define TAG_TABLE_HEADING   "TAGS_FOR_CODE_PAGE"
+#define ATTR_TABLE_HEADING  "ATTRIBUTES_FOR_CODE_PAGE"
+#define NO_STRINGS "NO_STRINGS"
+
+/* ----------------------------------------------------------------------- **
+   Types for various tables.
+** ----------------------------------------------------------------------- **/
+#define NAME_TABLE_T    "NW_Byte"
+#define TOKEN_TABLE_T   "NW_WBXML_DictEntry_t"
+#define CODEPAGE_TABLE_T  "NW_WBXML_Codepage_t"
+#define DICTIONARY_TABLE_T  "NW_WBXML_Dictionary_t"
+#define NAMES_T     "NW_String_UCS2Buff_t"
+#define ELEMENT_T "NW_%s_Element"
+#define ATTRIBUTE_T "NW_%s_Attribute"
+#define ELEMENT_TOKEN_T "NW_%s_ElementToken"
+#define ATTRIBUTE_TOKEN_T "NW_%s_AttributeToken"
+
+/* ----------------------------------------------------------------------- **
+   Misc array limits
+** ----------------------------------------------------------------------- **/
+#define TABLE_SIZE      255
+#define MAX_LINE        255
+#define MAX_NAME        255
+#define MAX_TOKEN       4
+#define MAX_DICT_NAME   255
+#define MAX_PUBLIC_ID   255
+#define MAX_DOC_TYPE    255
+#define MAX_START_NAME  255
+#define MAX_TYPE_NAME   255
+
+/* ----------------------------------------------------------------------- **
+  Names used in the generated tables
+** ----------------------------------------------------------------------- **/
+#define TAG_NAME    "tag"
+#define ATTR_NAME   "attribute"
+
+
+/* ----------------------------------------------------------------------- **
+   Define a type for codepage storage
+** ----------------------------------------------------------------------- **/
+typedef struct codepage_s {
+  int   num;    /* the code page number */
+  int   size;   /* the number of entries in table */
+} codepage_t;
+
+
+/* ----------------------------------------------------------------------- **
+   Header information
+** ----------------------------------------------------------------------- **/
+char dict_name[MAX_DICT_NAME];
+char doc_type[MAX_DOC_TYPE];
+char public_id[10];
+
+/* ----------------------------------------------------------------------- **
+   Scratch tables
+** ----------------------------------------------------------------------- **/
+char * tokens[TABLE_SIZE];
+char * names[TABLE_SIZE];
+int sorted_indexes[TABLE_SIZE];
+codepage_t tag_codepages[TABLE_SIZE];
+codepage_t attr_codepages[TABLE_SIZE];
+
+
+/* ----------------------------------------------------------------------- **
+   Records time of program execution and command line arguments
+** ----------------------------------------------------------------------- **/
+static time_t timestamp;
+static int main_argc = 1;
+static char** main_argv;
+
+/* ----------------------------------------------------------------------- **
+   Globals so error clean up is easy
+** ----------------------------------------------------------------------- **/
+static FILE* input_dict;
+static FILE* output_c;
+static FILE* output_h;
+
+static void exit_error(int exit_code) {
+  static char errmsg[]
+  = "#error \"Bad input dictionary data cannot complete code generation\"\n";
+  if (input_dict) fclose(input_dict);
+  if (output_c) {
+    fprintf(output_c, errmsg);
+    fclose(output_c);
+  }
+  if (output_h) {
+    fprintf(output_h, errmsg);
+    fclose(output_h);
+  }
+  exit(exit_code);
+}
+
+void print_usage(char* progname)
+{
+  fprintf(stderr,
+  "Dictionary creator - creates a .c and .h source file for a\n"
+  "NW_Wbxml_Dictionary_t structure from a dictionary data file.\n"
+  "\n"
+  "Usage: %s data_input_file dot_c_output_file dot_h_output_file\n"
+  "\n"
+  " - all args are required\n"
+  "\n"
+  "Comments are defined to be:\n"
+  "\n"
+  " - A line whose first non-whitespace char is '#'\n"
+  " - A blank line or line with only whitespace\n"
+  " Note: Comments are NOT permitted at the end of other lines.\n"
+  "\n"
+  "Input format:\n"
+  "\n"
+  " - Dictionary name = the first non-comment line.  The dictionary\n"
+  "   that will be created will use this string in the dictionary \n"
+  "   name.  For example, if the dictionary name is \"wml\", the\n"
+  "   following dictionary will be created:\n"
+  "\n"
+  "     NW_Wbxml_Dictionary_t NW_wml_dictionary = { ... }\n"
+  "\n"
+  " - Public id = the second non-comment line.  This is the Public \n"
+  "   Identifier as specified in section 7.2 of the WBML spec.  If\n"
+  "   a public id has not been defined, use \"1\".\n"
+  "\n"
+  " - Doc Type = the third non-comment line.  This is the source\n"
+  "   document's Document Type Declaration.\n"
+  "\n"
+  " - The beginning of a Tag table has the following syntax:\n"
+  "\n"
+  "     TAGS_FOR_CODE_PAGE <codepage_number> [NO_STRINGS]\n"
+  "\n"
+  "     <codepage_number> is required and is a base 10 number\n"
+  "\n"
+  "     [NO_STRINGS] is an optional keyword which means output only\n"
+  "     the token structures, treat all token names as empty strings\n"
+  "\n"
+  " - The beginning of an Attribute table has the following syntax:\n"
+  "\n"
+  "     ATTRIBUTES_FOR_CODE_PAGE <codepage_number> [NO_STRINGS]\n"
+  "     \n"
+  "     <codepage_number> is required and is a base 10 number\n"
+  "\n"
+  "     [NO_STRINGS] is an optional keyword which means output only\n"
+  "     the token structures, treat all token names as empty strings\n"
+  "\n"
+  " - The syntax for an entry is the same for both Tag and Attribute \n"
+  "   tables\n"
+  "\n"
+  "     <token> <name>\n"
+  "\n"
+  "     <token> must be a hexadecimal number written as 0x?? (e.g., 0x07)\n"
+  "     NOTE: Tokens are sorted as strings so 0x7 MUST be entered as 0x07\n"
+  "           or the sorting won't work!  It is ok to mix case as all hex\n"
+  "           digits are converted to lower case before the sort.\n"
+  "\n"
+  "     <name> is any sequence of printable characters without whitespace\n"
+  "\n"
+  " - The input tables do NOT have to be sorted \n"
+  "\n"
+  " - If a language has \"Attribute Value Tokens\", they should be included\n"
+  "   in the Attribute table\n"
+  "\n"
+  "Example input file (example.dict):\n"
+  "\n"
+  "  #\n"
+  "  # Sample dictionary for the WML language\n"
+  "  #\n"
+  "  wml\n"
+  "  #\n"
+  "  # WML version 1.2 has a public id of 9\n"
+  "  #\n"
+  "  9\n"
+  "  #\n"
+  "  # WML 1.2 doc type\n"
+  "  #\n"
+  "  -//WAPFORUM//DTD WML 1.1//EN\n"
+  "  #\n"
+  "  # Tags\n"
+  "  #\n"
+  "  TAGS_FOR_CODE_PAGE 0\n"
+  "  0x2b go\n"
+  "  0x1d td\n"
+  "  #\n"
+  "  # Attributes\n"
+  "  #\n"
+  "  ATTRIBUTES_FOR_CODE_PAGE 0\n"
+  "  0x12 format\n"
+  "  0xA0 wrap\n"
+  "  0x23 newcontext=true\n"
+  "  0x8F http://www.\n"
+  "\n"
+  "Example run command:\n"
+  "\n"
+  "  %s example.dict example.c example.h\n",
+  progname, progname);
+}
+
+static void print_automaticallyGeneratedCodeWarning(FILE *f)
+{
+  int i;
+  static char automaticallyGeneratedCodeWarning[] =
+  "/*\n"
+  "** WARNING\n"
+  "**\n"
+  "** DO NOT EDIT - THIS CODE IS AUTOMATICALLY GENERATED\n"
+  "**               FROM A DATA FILE BY THE DICTIONARY CREATION PROGRAM";
+
+  fprintf(f, "%s\n", automaticallyGeneratedCodeWarning);
+  fprintf(f,
+          "**\n"
+          "** This file generated on %s"
+          "**                        (coordinated universal time)\n"
+          "**\n"
+          "** Command line: ",
+          asctime(gmtime(&timestamp))); /* asctime() generates a newline at the end */
+  fprintf(f, "%s", main_argv[0]);
+  for (i = 1; i < main_argc; i++) {
+    fprintf(f, " %s", main_argv[i]);
+  }
+  fprintf(f, "\n*/");
+}
+
+static void print_copyright(FILE *f)
+{
+  struct tm* tm_time;
+  static const char copyright[] =
+  "/* ****************************************************************\n"
+  "**          Copyright %d - Nokia Corporation  All rights reserved.\n"
+  "**          Nokia Americas\n"
+  "**          6000 Connection Drive\n"
+  "**          Irving, Texas 75039\n"
+  "**\n"
+  "**          Restricted Rights: Use, duplication, or disclosure by the\n"
+  "**          U.S. Government is subject to restrictions as set forth in\n"
+  "**          subparagraph (c)(1)(ii) of DFARS 252.227-7013, or in FAR\n"
+  "**          52.227-19, or in FAR 52.227-14 Alt. III, as applicable.\n"
+  "**\n"
+  "**          This software is proprietary to and embodies the confidential\n"
+  "**          technology of Nokia  Possession, use, or copying of this software\n"
+  "**          and media is authorized only pursuant to a valid written license\n"
+  "**          from Nokia or an authorized sublicensor.\n"
+  "**\n"
+  "**          Nokia  - Wireless Software Solutions\n"
+  "*****************************************************************/";
+
+  tm_time = gmtime(&timestamp);
+  fprintf(f, copyright,
+          tm_time->tm_year + 1900);
+}
+
+static FILE * open_file(char* fn, char *perms){
+  FILE* f;
+  
+  if ((fn == 0)||((f = fopen(fn, perms)) == 0)){    
+    return 0;
+  }else{    
+    return f;
+  }
+  
+}
+
+static init() {
+  int i;
+
+  for (i=0; i < TABLE_SIZE; i++) {
+    tag_codepages[i].num = -1;
+    attr_codepages[i].num = -1;
+  }
+}
+
+
+/* ----------------------------------------------------------------------- **
+  Read the next line of input and store it in s.  
+ 
+  NOTE: s will have the new-line character stripped
+ 
+  RETURN: 1 for success and 0 for EOF or failure 
+** ----------------------------------------------------------------------- **/
+static int get_line(FILE *f, char s[], int n){
+  int i = 0, j, indx, len;
+  char line[MAX_LINE];
+
+  for(;;) {
+    if ((fgets(line, n, f)) == 0) {
+      /* Either EOF or an error occurred */
+      return 0;
+    }
+    len = (int) strlen(line);
+    /* Skip any preceeding whitespace */
+    for (i=0; i < len; i++) {
+      if (isspace(line[i]))
+      continue;
+      break;
+    }
+    if (i >= len || line[i] == '#')
+      continue;
+    break;
+  }
+
+  /* Fill in s */
+  for (j=i, indx = 0; j < (int) strlen(line); i++, j++, indx++) {
+    if (line[j] == '\n') {
+      break;
+    }
+    if (line[j] == '\t') {
+      /* convert tab to space for isprint() test */
+      line[j] = ' ';
+    }
+    if (!isprint(line[j])) {
+      /* stops on bogus char */
+      fprintf(stderr,
+              "ERROR: Illegal character (may be control char) in input text "
+              "near file byte offset %ld\n",
+              ftell(f));
+      exit_error(1);
+    }
+    s[indx] = line[j];
+    if (indx + 1 == MAX_LINE) break;
+  }
+
+  if (indx > 0)
+    s[indx] = '\000';
+
+  return 1;
+}
+
+
+/* ----------------------------------------------------------------------- **
+   Read the a line of input and break it into three items:
+   For table header
+      1. Table type name
+      2. Code page number
+      3. Optional "NO_STRINGS"
+   For table entry
+      1. 0x?? token value
+      2. token string (optional, extends from first nonspace to eol)
+      3. null
+ 
+  RETURN: 1 for success and 0 for EOF or failure
+ ** ----------------------------------------------------------------------- **/
+static int get_tuple(FILE *f, char item1[], char item2[], char item3[])
+{
+  char line[MAX_LINE];
+  int i;
+  int j;
+  int len;
+
+  if ((get_line(f, line, MAX_LINE)) != 1) {
+    return 0;
+  }
+
+  len = (int)strlen(line);
+
+  /* tablename or token hex value */
+  j = 0;
+  for (i = 0; i < len; i++) {
+    if (isspace(line[i])) break;
+    if (item1[0] == '0' && j == MAX_TOKEN) {
+      /* have to check for leading '0' because this func is called to process
+      TAG_TABLE_HEADING lines too where length could be longer than MAX_TOKEN */
+      fprintf(stderr, "ERROR: token value too long near input file byte offset %ld\n",
+              ftell(f));
+      exit_error(1);
+      break;
+    }
+    item1[j++] = line[i];
+  }
+  item1[j] = '\0';
+
+  /* whitespace */
+  for (; i < len; i++) {
+    if (!isspace(line[i])) break;
+  }
+
+  /* codepage or token string */
+  j = 0;
+  for (/* continue with i */; i < len; i++) {
+    if (item1[0] != '0' && isspace(line[i])) break;
+    if (j == MAX_NAME) {
+      fprintf(stderr, "ERROR: token string too long near input file byte offset %ld\n",
+              ftell(f));
+      exit_error(1);
+      break;
+    }
+    item2[j++] = line[i];
+  }
+  item2[j] = '\0';
+
+  /* whitespace */
+  for (; i < len; i++) {
+    if (!isspace(line[i])) break;
+  }
+
+  /* nostrings or nothing */
+  j = 0;
+  for (/* continue with i */; i < len; i++) {
+    item3[j++] = line[i];
+  }
+  item3[j] = '\0';
+
+  return 1;
+}
+
+static void process_header(FILE *f)
+{
+  if ((get_line(f, dict_name, MAX_DICT_NAME)) != 1) {
+    fprintf(stderr, "ERROR: reading dictionary name\n");
+    exit_error(1);
+  }
+
+  if ((get_line(f, public_id, MAX_PUBLIC_ID)) != 1) {
+    fprintf(stderr, "ERROR: reading public id\n");
+    exit_error(1);
+  }
+
+  if ((get_line(f, doc_type, MAX_DOC_TYPE)) != 1) {
+    fprintf(stderr, "ERROR: reading doc type\n");
+    exit_error(1);
+  }
+}
+
+static void print_file_header(FILE *output, FILE *outputHeader)
+{
+  fprintf(output, "/*\n");
+  fprintf(output, " * Dictionary = %s\n", dict_name);
+  fprintf(output, " * Public id = %s\n", public_id);
+  fprintf(output, " * Doc Type = %s\n", doc_type);
+  fprintf(output, " */\n");
+  fprintf(output, "\n");
+
+  fprintf(output, "#include \"%s\"\n", main_argv[3]);
+  fprintf(output, "#include \"xml\/cxml\/nw_wbxml_dictionary.h\"\n");
+
+  fprintf(output, "\n");
+
+  /* Including the typedef for public id */
+  fprintf(outputHeader, "#define NW_%s_PublicId %s\n", dict_name, public_id);
+}
+
+static void print_table_header(FILE *output, char * table_type, char *type, char *key, char *code_page, int n)
+{
+  print_automaticallyGeneratedCodeWarning(output);
+  fprintf(output, "\n\n");
+  fprintf(output, "/*\n");
+  fprintf(output, " * %s entries - sorted by %s\n", type, key);
+  fprintf(output, " */\n");
+  fprintf(output, "static const\n");
+  fprintf(output, "%s NW_%s_%s_%s_%s[%d] = {\n", table_type, dict_name, type, key, code_page, n);
+}
+
+static void process_entry(int i, char *token, char *name) 
+{
+  tokens[i] = strdup(token);
+  names[i] = strdup(name);
+  sorted_indexes[i] = i;
+}
+
+
+/* ----------------------------------------------------------------------- **
+   Print the table of tokens and names - sorted by token
+   Also create a list of the items, sorted by name 
+ ** ----------------------------------------------------------------------- **/
+static void print_token_table(FILE *output, FILE* outputHeader,
+                              char *type, char *key, char *code_page, int n,
+                              int use_strings)
+{
+  static char tagTypeString[MAX_TYPE_NAME];
+  static char tokenTypeString[MAX_TYPE_NAME];
+
+  /* Must first sort by token */
+  int i, j;
+  char *tmp_token;
+  char *tmp_name;
+  char *tagType = &tagTypeString[0];
+
+  if (strcmp("tag", type) == 0)
+  {
+    (void)sprintf(tagTypeString, ELEMENT_T, dict_name);
+    (void)sprintf(tokenTypeString, ELEMENT_TOKEN_T, dict_name);
+  }
+  else if (strcmp("attribute", type) == 0)
+  {
+    (void)sprintf(tagTypeString, ATTRIBUTE_T, dict_name);
+    (void)sprintf(tokenTypeString, ATTRIBUTE_TOKEN_T, dict_name);
+  }
+  else {
+    fprintf(stderr, "ERROR: internal error\n");
+    exit_error(1);
+  }
+
+  /* make all the tokens lower case */
+  for (i=0; i < n; i++) {
+    int l = (int)strlen(tokens[i]);
+    if (l != 4) {
+      fprintf(stderr, 
+              "ERROR: Badly formatted token %s\n"
+              "All token values must be in the form 0x?? (e.g., 0x07) "
+              "or the sorting algorithm won't work.\n"
+              , tokens[i]);
+      exit_error(1);
+    }
+    for (j=0; j < l; j++) {
+      if (isupper(tokens[i][j])) {
+        tokens[i][j] = (char)tolower(tokens[i][j]);
+      }
+      if ((tokens[i][j] != 'x') && isalpha(tokens[i][j])) {
+        if ((tokens[i][j] < 'a') || (tokens[i][j] > 'f')) {
+          fprintf(stderr, 
+                  "ERROR: Illegal hex digit in token %s\n"
+                  , tokens[i]);
+          exit_error(1);
+        }
+      }
+    }
+  }
+
+  for (i=0; i < n-1; i++) {
+    for (j=0; j < n-1; j++) {
+      /* 
+       * Sort by token 
+       */
+      if ((strcmp(tokens[j], tokens[j+1])) > 0) {
+        /* Swap the two elements */
+        tmp_token = tokens[j];
+        tmp_name = names[j];
+        tokens[j] = tokens[j+1];
+        names[j] = names[j+1];
+        tokens[j+1] = tmp_token;
+        names[j+1] = tmp_name;
+      }
+    }
+  }
+
+  /*
+   * print variables
+   */
+  fprintf(output, "\n");
+  for (i=0; i < n; i++) {
+    char tempName[MAX_NAME+1];
+    int l;
+    if (isdigit(names[i][0])) {
+      tempName[0] = '_';
+      strcpy(tempName+1, names[i]);
+    } else {
+      strcpy(tempName, names[i]);
+    }
+    l = (int)strlen(tempName);
+    for (j = 0; j < l; j++) {
+      if (isdigit(tempName[j])
+          || isalpha(tempName[j])
+          || (tempName[j] == '_')) {
+        continue;
+      }
+      tempName[j] = '_';
+    }
+    if (use_strings) {
+      fprintf(output, 
+              "static const NW_Ucs2 %sTag_%s[] = {"
+              , tagType, tempName);
+      for (j=0; j < (int) strlen(names[i]); j++) {
+        if (names[i][j] == '\\') {
+          fprintf(output, "\'\\\\\',");
+        } else {
+          fprintf(output, "\'%c\',", names[i][j]);
+        }
+      }
+      fprintf(output, "\'\\0\'};\n");
+    }
+  }
+  if (!use_strings) {
+    fprintf(output,
+            "static const NW_Ucs2 %sTag_emptyString_%s[] = { \'\\0\' };\n"
+            , tagType, code_page);
+  }
+  fprintf(output, "\n");
+
+  print_table_header(output, TOKEN_TABLE_T, type, key, code_page, n);
+  if (use_strings) {
+    fprintf(outputHeader, 
+            "\ntypedef enum %sToken_%s_e{\n", 
+            tagType, code_page);
+  }
+ /*
+  * Print the table
+  */
+  for (i=0; i < n; i++) {
+    char tempName[MAX_NAME+1] ;
+    char tempToken[6] ;
+    char *token;
+    int l;
+    if (isdigit(names[i][0])) {
+      tempName[0] = '_';
+      strcpy(tempName+1, names[i]);
+    } else {
+      strcpy(tempName, names[i]);
+    }
+    l = (int)strlen(tempName);
+    for (j = 0; j < l; j++) {
+      if (isdigit(tempName[j])
+          || isalpha(tempName[j])
+          || (tempName[j] == '_')) {
+        continue;
+      }
+      tempName[j] = '_';
+    }
+    strcpy(tempToken, tokens[i]);
+    token = strchr(tempToken, 'x');
+    token++;
+    if (use_strings) {
+      fprintf(output, "\t{%s, (%s *) %sTag_%s", tokens[i], NAMES_T, tagType, tempName);
+      fprintf(outputHeader, "\t%s_%s = 0x0%s%s", tokenTypeString, tempName, code_page, token);
+    } else {
+      fprintf(output, "\t{%s, &%sTag_emptyString_%s", tokens[i], tagType, code_page);
+    }
+    
+    if (i == (n-1))
+    {
+      fprintf(output, "}\n");
+      if (use_strings) {
+        fprintf(outputHeader, "\n");
+      }
+    }
+    else
+    {
+      fprintf(output, "},\n");
+      if (use_strings) {
+        fprintf(outputHeader, ",\n");
+      }
+    }
+  }
+  fprintf(output, "};\n\n");
+  if (use_strings) {
+    fprintf(outputHeader, "}%sToken_%s_t;\n\n", tagType, code_page);
+  }
+
+  if (use_strings) {
+    /*
+    * Create an array of the names sorted by index
+    */
+    for (i=0; i < n-1; i++) {
+      for (j=0; j < n-1; j++) {
+        /*
+        * Since we will need an array of the names sorted by index,
+        * generate that arrary now.
+        */
+        if ((strcmp(names[j], names[j+1])) > 0) {
+          /* Swap the two names */
+          int tmp_token;
+          tmp_name = names[j];
+          tmp_token = sorted_indexes[j];
+          names[j] = names[j+1];
+          names[j+1] = tmp_name;
+          sorted_indexes[j] = sorted_indexes[j+1];
+          sorted_indexes[j+1] = tmp_token;
+        }
+      }
+    }
+  }
+}
+
+static void cache_codepage(codepage_t table[], char *cp_num, int n)
+{
+  int num = atoi(cp_num);
+
+  if (num >= TABLE_SIZE) {
+    fprintf(stderr, "ERROR: Codepage '%d' is too large!\n", num);
+    exit(1);
+  }
+
+  table[num].num = num; 
+  table[num].size = n; 
+}
+
+/*
+ * Print a table of the names 
+ */
+static void print_name_table(FILE *output, char *type, char *key, char *code_page, int n,
+                             int use_strings)
+{
+  int i;
+
+  print_table_header(output, NAME_TABLE_T, type, key, code_page, n);
+
+  for (i=0; i < n; i++) {
+    if (use_strings) {
+      fprintf(output, "\t%d,\n", sorted_indexes[i]);
+    } else {
+      fprintf(output, "\t0,\n");
+    }
+  }
+
+  fprintf(output, "};\n");
+}
+
+static process_content(FILE *f, FILE *output, FILE* outputHeader)
+{
+  char token[MAX_START_NAME+1]; /* Must be big enough to hold a 
+                                   tag/attr start string */
+  char name[MAX_NAME+1];
+  char optional[MAX_LINE+1];
+  char *tag_code_page = "";
+  char *attr_code_page = "";
+  char processing_tag = 2;  /* processing state: 1 = tag, 0 = attribute, 2 = init */
+  int n = 0;
+  int use_strings = 1;
+
+  for(;;) {
+
+    if ((get_tuple(f, token, name, optional)) != 1) {
+      break;
+    }
+
+    if (!strcmp(token, TAG_TABLE_HEADING)) {
+      use_strings = strcmp(optional, NO_STRINGS);
+      if (processing_tag == 1) {
+        /* Process the current tag table */
+        print_token_table(output, outputHeader, TAG_NAME, "token", tag_code_page, n, use_strings);
+        print_name_table(output, TAG_NAME, "name", tag_code_page, n, use_strings);
+        cache_codepage(tag_codepages, tag_code_page, n);
+        n = 0;
+      } else if (processing_tag == 0) {
+        /* Process the current attribute table */
+        print_token_table(output, outputHeader, ATTR_NAME, "token", attr_code_page, n, use_strings);
+        print_name_table(output, ATTR_NAME, "name", attr_code_page, n, use_strings);
+        cache_codepage(attr_codepages, attr_code_page, n);
+        n = 0;
+      }
+      tag_code_page = strdup(name);
+      processing_tag = 1;
+    }
+    else if (!strcmp(token, ATTR_TABLE_HEADING)) {
+      use_strings = strcmp(optional, NO_STRINGS);
+      if (processing_tag == 1) {
+        /* Process the current tag table */
+        print_token_table(output, outputHeader, TAG_NAME, "token", tag_code_page, n, use_strings);
+        print_name_table(output, TAG_NAME, "name", tag_code_page, n, use_strings);
+        cache_codepage(tag_codepages, tag_code_page, n);
+        n = 0;
+      } else if (processing_tag == 0) {
+        /* Process the current attribute table */
+        print_token_table(output, outputHeader, ATTR_NAME, "token", attr_code_page, n, use_strings);
+        print_name_table(output, ATTR_NAME, "name", attr_code_page, n, use_strings);
+        cache_codepage(attr_codepages, attr_code_page, n);
+        n = 0;
+      }
+      attr_code_page = strdup(name);
+      processing_tag = 0;
+    } else {
+      process_entry(n, token, name);
+      n++;
+    }
+  }
+
+  if (processing_tag == 2) {
+    fprintf(stderr, 
+            "ERROR: Could not find tag or attribute table starts in file.\n"
+            "       Input file syntax has changed.\n"
+            "       See usage by executing this program with no arguments.\n");
+    exit_error(1);
+  }
+
+  /*
+   * If anything is left, process it
+   */
+  if (n > 0) {
+    if (processing_tag == 1) {
+      print_token_table(output, outputHeader, TAG_NAME, "token", tag_code_page, n, use_strings);
+      print_name_table(output, TAG_NAME, "name", tag_code_page, n, use_strings);
+      cache_codepage(tag_codepages, tag_code_page, n);
+    } else if (processing_tag == 0) {
+      print_token_table(output, outputHeader, ATTR_NAME, "token", attr_code_page, n, use_strings);
+      print_name_table(output, ATTR_NAME, "name", attr_code_page, n, use_strings);
+      cache_codepage(attr_codepages, attr_code_page, n);
+    }
+  }
+}
+
+static void get_num_codepages(codepage_t cp[], int *n, int *max)
+{
+  int i;
+  /* Determine the number of codepages */
+  for (i=0; i < TABLE_SIZE; i++) {
+    if (cp[i].num != -1) {
+      *max = i;
+      (*n)++;
+    }
+  }
+}
+
+static void print_codepage_table(FILE *output, codepage_t cp[], int n, int max, char *type)
+{
+  int i;
+
+  if (n == 0)
+  return;
+
+  fprintf(output, "static const\n");
+  fprintf(output, "%s NW_%s_%s_codepages[%d] = {\n", CODEPAGE_TABLE_T, 
+      dict_name, type, max + 1);
+
+  for (i=0; i <= max && i < TABLE_SIZE; i++) {
+    if (cp[i].num == -1) {
+      fprintf(output, "\t{0, 0, 0},\n");
+    } else {
+      fprintf(output, "\t{%d, (%s*)&NW_%s_%s_token_%d[0], ", 
+      cp[i].size, TOKEN_TABLE_T, dict_name, type, cp[i].num);
+      fprintf(output, "(NW_Byte *)&NW_%s_%s_name_%d[0]},\n", 
+      dict_name, type, cp[i].num);
+    }
+  }
+  fprintf(output, "};\n");
+}
+
+static void print_codepage_tables(FILE *output) 
+{
+  int n=0, max=0;
+
+  /* Tag tables */
+  fprintf(output, 
+          "\n"
+          "/*\n"
+          " * Tag codepage table\n"
+          " */\n"
+          );
+
+  get_num_codepages(tag_codepages, &n, &max);
+  print_codepage_table(output, tag_codepages, n, max, TAG_NAME);
+
+  /* Attr tables */
+  fprintf(output, 
+          "\n"
+          "/*\n"
+          " * Attribute codepage table\n"
+          " */\n"
+          );
+
+  n = max = 0;
+  get_num_codepages(attr_codepages, &n, &max);
+  print_codepage_table(output, attr_codepages, n, max, ATTR_NAME);
+}
+
+static void add_codepage(FILE *output, codepage_t cp[], char *type)
+{
+  int n=0, max=0;
+
+  get_num_codepages(cp, &n, &max);
+
+  if (n == 0)
+    fprintf(output, "\t0, 0,\n");
+  else
+    fprintf(output, "\t%d, (%s*)&NW_%s_%s_codepages[0],\n", max + 1, CODEPAGE_TABLE_T, dict_name, type);
+}
+
+static void print_dictionary_table(FILE *output, FILE *outputHeader)
+{
+  int i;
+  if (strlen(doc_type) > 0)
+  {
+    fprintf(output, "\nstatic const NW_Ucs2 NW_%s_docType[] = {", dict_name);
+    for (i=0; i < (int) strlen(doc_type); i++)
+      fprintf(output, "\'%c\',", doc_type[i]);
+    fprintf(output, "\'\\0\'};\n");
+  }
+
+  fprintf(output, 
+          "\n"
+          "/*\n"
+          " * Dictionary\n"
+          " */\n"
+          );
+
+  fprintf(outputHeader, "extern const %s NW_%s_WBXMLDictionary\n",
+          DICTIONARY_TABLE_T, dict_name);
+  fprintf(output, "%s NW_%s_WBXMLDictionary = {\n", DICTIONARY_TABLE_T, dict_name);
+  fprintf(output, "\tNW_%s_PublicId,\n", dict_name);
+
+  /* Print the doc type as a UCS2 string */
+  fprintf(output, "\t(%s *)NW_%s_docType,\n", "NW_Ucs2", dict_name);
+
+  /* Add the tag and attribute code page */
+  add_codepage(output, tag_codepages, TAG_NAME);
+  add_codepage(output, attr_codepages, ATTR_NAME);
+
+  fprintf(output, "};\n");
+}
+
+static void process_file(FILE *f, FILE *output, FILE* outputHeader)
+{
+  process_header(f);
+
+  print_file_header(output, outputHeader);
+
+  process_content(f, output, outputHeader);
+
+  print_codepage_tables(output);
+
+  print_dictionary_table(output, outputHeader);
+}
+
+int main(int argc, char ** argv){
+  if (argc < 4) {
+    print_usage(argv[0]);
+    exit_error(1);
+  }
+
+  init();
+
+  input_dict = NULL;
+  output_c = NULL;
+  output_h = NULL;
+
+  /* ----------------------------------------------------------------------- **
+     Save info used in print_automaticallyGeneratedCodeWarning()   
+  ** ----------------------------------------------------------------------- **/
+  (void)time(&timestamp);
+  main_argc = argc;
+  main_argv = argv;
+
+
+  /* ----------------------------------------------------------------------- **
+     Work on files in text mode to ease end-of-line processing in DOS.  
+  ** ----------------------------------------------------------------------- **/
+  if ((input_dict = open_file(argv[1], "rt")) == NULL) {
+    fprintf(stderr, "ERROR: Input File '%s' could NOT be opened!\n", argv[1]);
+    exit_error(1);
+  }
+
+  if ((output_c = open_file(argv[2], "wt")) == NULL) {
+    fprintf(stderr, "ERROR: Output .c File '%s' could NOT be opened!\n", argv[2]);
+    exit_error(1);
+  }
+
+  if ((output_h = open_file(argv[3], "wt")) == NULL) {
+    fprintf(stderr, "ERROR: Output .h File '%s' could NOT be opened!\n", argv[3]);
+    exit_error(1);
+  }
+
+  print_copyright(output_c);
+  fprintf(output_c, "\n\n");
+  print_automaticallyGeneratedCodeWarning(output_c);
+  fprintf(output_c, "\n\n");
+
+  print_copyright(output_h);
+  fprintf(output_h, "\n\n");
+  print_automaticallyGeneratedCodeWarning(output_h);
+  fprintf(output_h, "\n\n");
+
+  {
+    int l;
+    char* p = strrchr(argv[3], '.');
+    l = (p == NULL) ? (int)strlen(argv[3]) : p - argv[3];
+
+    fprintf(output_h, "#ifndef HEADER_GUARD_%.*s", l, argv[3]);
+    if (p != NULL) fprintf(output_h, "_%s", p+1);
+    fprintf(output_h,
+            "\n"
+            "#define HEADER_GUARD_%.*s"
+            , l, argv[3]);
+    if (p != NULL) fprintf(output_h, "_%s", p+1);
+    fprintf(output_h, 
+            "\n"
+            "\n"
+            "#ifdef __cplusplus\n"
+            "extern \"C\"\n"
+            "{\n"
+            "#endif\n"
+            "\n"
+            "\n"
+            );
+  }
+
+  /* process input */
+  process_file(input_dict, output_c, output_h);
+
+  fprintf(output_c, "\n");
+  print_automaticallyGeneratedCodeWarning(output_c);
+
+  fprintf(output_c, "\n");
+  fprintf(output_h, "\n");
+  print_automaticallyGeneratedCodeWarning(output_h);
+
+  fprintf(output_h,
+          "\n"
+          "\n"
+          "#ifdef __cplusplus\n"
+          "} /* extern \"C\" */\n"
+          "#endif\n"
+          "\n"
+          "#endif\n"
+          );
+  
+  /* close files */
+  fclose(input_dict);
+  fclose(output_c);
+  fclose(output_h);
+
+  return 0;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/push_nokprov.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,81 @@
+#
+# Dictionary for push_nokprov
+#
+######################################################
+#
+# dictionary name
+#
+push_nokprov
+#
+# Public id
+#
+1
+#
+# Doc type
+#
+-//WAPFORUM//DTD PROV 1.//EN
+#
+# Tag table - all are in code page 
+#
+TAGS_FOR_CODE_PAGE 0
+0x05	characteristic-list
+0x06	characteristic
+0x07	parm
+
+#
+# Attribute table - all are in code page 
+#
+ATTRIBUTES_FOR_CODE_PAGE 0
+0x06	type=ADDRESS
+0x07	type=URL
+0x08	type=NAME
+0x10	name
+0x11	value
+0x12	name=BEARER
+0x13	name=PROXY
+0x14	name=PORT
+0x15	name=NAME
+0x16	name=PROXY_TYPE
+0x17	name=URL
+0x18	name=PROXY_AUTHNAME
+0x19	name=PROXY_AUTHSECRET
+0x1A	name=SMS_SMSC_ADDRESS
+0x1B	name=USSD_SERVICE_CODE
+0x1C	name=GPRS_ACCESSPOINTNAME
+0x1D	name=PPP_LOGINTYPE
+0x1E	name=PROXY_LOGINTYPE
+0x21	name=CSD_DIALSTRING
+0x22	name=PPP_AUTHTYPE
+0x23	name=PPP_AUTHNAME
+0x24	name=PPP_AUTHSECRET
+0x28	name=CSD_CALLTYPE
+0x29	name=CSD_CALLSPEED
+0x45	GSM/CSD
+0x46	GSM/SMS
+0x47	GSM/USSD
+0x48	IS-136/CSD
+0x49	GPRS
+0x60	9200
+0x61	9201
+0x62	9202
+0x63	9203
+0x64	AUTOMATIC
+0x65	MANUAL
+0x6A	AUTO
+0x6B	9600
+0x6C	14400
+0x6D	19200
+0x6E	28800
+0x6F	38400
+0x70	PAP
+0x71	CHAP
+0x72	ANALOGUE
+0x73	ISDN
+0x74	43200
+0x75	57600
+0x76	MSISDN_NO
+0x77	IPV4
+0x78	MS_CHAP
+0x7D	type=ID
+0x7E	name=ISP_NAME
+0x7F	type=BOOKMARK

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/readme.txt	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,41 @@
+About the WBXML Token Dictionaries
+
+WBXML can use tokens to represent tag names, attribute names, attribute
+names combined with part or all of the attribute value, and part or all
+of an attribute value.
+
+The cXML code needs internal tables that map tokens to strings and strings
+to tokens.  To simplify the generation of these tables (dictionaries) a
+simple data file giving token-string pairs is processed by a dictionary
+creator utility program which outputs the required .h and .c files.
+
+The dictionary creator program source code is in dict_creator.c and it
+is a stand-alone program.  To compile it with the MS C compiler use the
+command: cl /Zi /W4 /WX dict_creator.c
+
+If you encounter following errors about lib.c can't be found or stdio.h is 
+not found in path, you need to set up system var:
+
+INCLUDE: C:\progra~1\micros~3\VC98\Include
+LIB: C:\progra~1\micros~3\VC98\lib
+
+To get dict_creator usage info run dict_creator with no arguments.
+
+Files with extension ".dict" are data input files.
+
+Example runs:
+
+dict_creator xhtml_1_0.dict xhtml_1_0_dict.c nw_xhtml_xhtml_1_0_tokens.h
+dict_creator wml_1_3.dict wml_1_3_dict.c nw_wml1x_wml_1_3_tokens.h
+
+dict_creator si.dict si_dict.c si_dict.h
+
+
+You have to get through dict_creator without errors and then you have to
+get through the C compiler on the output.  If the output doesn't compile,
+it may be because dict_creator did something wrong.  Dict_creator has to
+make a few transformations on the input to create C variable names and it
+is possible (though we hope never encountered in use) that this produces
+output that won't compile.
+
+END

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/si.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,48 @@
+#
+# Dictionary for SI
+#
+######################################################
+#
+# dictionary name
+#
+SI
+#
+# Public id
+#
+5
+#
+# Doc type
+#
+-//WAPFORUM//DTD SI 1.0//EN
+#
+# Tag table - all are in code page 0
+#
+TAGS_FOR_CODE_PAGE 0
+0x05	si
+0x06	indication
+0x07	info
+0x08	item
+
+#
+# Attribute table - all are in code page 0
+#
+ATTRIBUTES_FOR_CODE_PAGE 0
+0x05	action=signal-none
+0x06	action=signal-low
+0x07	action=signal-medium
+0x08	action=signal-high
+0x09	action=delete
+0x0a	created
+0x0b	href
+0x0c	href=http://
+0x0d	href=http://www.
+0x0e	href=https://
+0x0f	href=https://www.
+0x10	si-expires
+0x11	si-id
+0x12	class
+0x13    action
+0x85	.com/
+0x86	.edu/
+0x87	.net/
+0x88	.org/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/sl.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,38 @@
+#
+# Dictionary for SL
+#
+######################################################
+#
+# dictionary name
+#
+SL
+#
+# Public id
+#
+6
+#
+# Doc type
+#
+-//WAPFORUM//DTD SL 1.0//EN
+#
+# Tag table - all are in code page 0
+#
+TAGS_FOR_CODE_PAGE 0
+0x05	sl  
+
+#
+# Attribute table - all are in code page 0
+#
+ATTRIBUTES_FOR_CODE_PAGE 0
+0x05	action=execute-low  
+0x06	action=execute-high  
+0x07	action=cache  
+0x08	href  
+0x09	href=http://  
+0x0a	href=http://www.  
+0x0b	href=https://  
+0x0c	href=https://www.  
+0x85	.com/  
+0x86	.edu/  
+0x87	.net/  
+0x88	.org/  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/syncml_1.1.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,118 @@
+#
+# Dictionary for SyncML#
+######################################################
+#
+# dictionary name
+#
+SyncML_1_0
+#
+# Public id for SyncML 1.0
+#
+0
+#
+# Doc type for WML 1.1
+#
+-//SYNCML/DTD SyncML v1.0/EN
+#
+# Tag table - all are in code page 0
+#
+TAGS_FOR_CODE_PAGE 0
+0x06 Add
+0x07 Alert
+0x08 Archive
+0x09 Atomic
+0x0a Cmd
+0x0b CmdID
+0x0c CmdRef
+0x0d Col
+0x0e Copy
+0x0f Create
+0x10 Cred
+0x11 Data
+0x12 Delete
+0x13 Exec
+0x14 Final
+0x15 Get
+0x16 Item
+0x17 Lang
+0x18 LocID
+0x19 LocName
+0x1a LocURI
+0x1b Map
+0x1c MapItem
+0x1d Meta
+0x1e MsgID
+0x1f MsgRef
+0x20 NoResp
+0x21 NoResults
+0x22 Proto
+0x23 Put
+0x24 Remove
+0x25 Replace
+0x26 Reply
+0x27 RespURI
+0x28 Results
+0x29 Search
+0x2a Sequence
+0x2b SessionID
+0x2c SftDel
+0x2d Source
+0x2e SourceRef
+0x2f Status
+0x30 StatusItem
+0x31 Sync
+0x32 SyncBody
+0x33 SyncHdr
+0x34 SyncML
+0x35 Target
+0x36 TargetRef
+0x37 Update
+0x38 Version
+#
+# Tag table - all are in code page 1
+#
+TAGS_FOR_CODE_PAGE 1
+0x10 Data
+0x11 Format
+0x12 Mark
+0x13 Size
+0x14 Type
+0x15 Version
+#
+# Tag table - all are in code page 2
+#
+TAGS_FOR_CODE_PAGE 2
+0x10 DevInf
+0x11 Man
+0x12 Mod
+0x13 OEM
+0x14 FwV
+0x15 FwD
+0x16 SwV
+0x17 SwD
+0x18 IrV
+0x19 HwD
+0x1a HwV
+0x1b DevID
+0x1c DevTyp
+0x1d KB
+0x1e Mouse
+0x1f Pen
+0x20 Spkr
+0x2a Mic
+0x2b ScnCol
+0x2c ScnSiz
+0x2d AB
+0x2e Cal
+0x2f Msg
+0x30 IMsg
+0x31 Jour
+0x32 Tx
+0x33 Rx
+0x34 Mul
+0x35 SbX
+0x36 Ext
+0x37 XNam
+0x38 XVal
+0x39 FreeID
+0x3a FreeMem

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xml/cxmllibrary/dictionary/wml_1.1.dict	Wed Jun 23 20:27:15 2010 +0530
@@ -0,0 +1,168 @@
+#
+# Dictionary for WML 1.1
+#
+######################################################
+#
+# dictionary name
+#
+Wml_1_1
+#
+# Public id for WML 1.1
+#
+4
+#
+# Doc type for WML 1.1
+#
+-//WAPFORUM//DTD WML 1.1//EN
+#
+# Tag table - all are in code page 0
+#
+TAGS_FOR_CODE_PAGE 0
+0x1c a
+0x23 access
+0x22 anchor
+0x24 b
+0x25 big
+0x26 br
+0x27 card
+0x28 do
+0x29 em
+0x2a fieldset
+0x2b go
+0x2c head
+0x2d i
+0x2e img
+0x2f input
+0x30 meta
+0x31 noop
+0x33 onevent
+0x34 optgroup
+0x35 option
+0x20 p
+0x32 prev
+0x21 postfield
+0x36 refresh
+0x37 select
+0x3e setvar
+0x38 small
+0x39 strong
+0x1f table
+0x1d td
+0x3b template
+0x3c timer
+0x1e tr
+0x3d u
+0x3f wml
+#
+# Attribute table - all are in code page 0
+#
+ATTRIBUTES_FOR_CODE_PAGE 0
+0x05	accept-charset
+0x52 	align
+0x06	align=bottom
+0x07	align=center
+0x08	align=left
+0x09	align=middle
+0x0A	align=right
+0x0B	align=top
+0x0C	alt
+0x54	class
+0x53	columns
+0x0D	content
+0x5C	content=application/vnd.wap.wmlc;charset=
+0x0F	domain
+0x10	emptyok=false
+0x11	emptyok=true
+0x12	format
+0x56	forua=false
+0x57	forua=true
+0x13	height
+0x4A	href
+0x4B	href=http://
+0x4C	href=https://
+0x14	hspace
+0x5A	http-equiv
+0x5B	http-equiv=Content-Type
+0x5D	http-equiv=Expires
+0x55	id
+0x15	ivalue
+0x16	iname
+0x18	label
+0x19	localsrc
+0x1A	maxlength
+0x1B	method=get
+0x1C	method=post
+0x1D	mode=nowrap
+0x1E	mode=wrap
+0x1F	multiple=false
+0x20	multiple=true
+0x21	name
+0x22	newcontext=false
+0x23	newcontext=true
+0x25	onenterbackward
+0x26	onenterforward
+0x24	onpick
+0x27	ontimer
+0x28	optional=false
+0x29	optional=true
+0x33	ordered=false
+0x34	ordered=true
+0x2A	path
+0x2E	scheme
+0x2F	sendreferer=false
+0x30	sendreferer=true
+0x31	size
+0x32	src
+0x58	src=http://
+0x59	src=https://
+0x35	tabindex
+0x36	title
+0x37	type
+0x38	type=accept
+0x39	type=delete
+0x3A	type=help
+0x3B	type=password
+0x3D	type=onenterbackward
+0x3E	type=onenterforward
+0x3C	type=onpick
+0x3F	type=ontimer
+0x45	type=options
+0x46	type=prev
+0x47	type=reset
+0x48	type=text
+0x49	type=vnd.
+0x4D	value
+0x4E	vspace
+0x4F	width
+0x50	xml:lang
+#
+# The attribute value tokens are treated just like the 
+# attribute start tokens
+#
+0x85	.com/
+0x86	.edu/
+0x87	.net/
+0x88	.org/
+0x89	accept
+0x8A	bottom
+0x8B	clear
+0x8C	delete
+0x8D	help
+0x8E	http://
+0x8F	http://www.
+0x90	https://
+0x91	https://www.
+0x93	middle
+0x94	nowrap
+0x95	onpick
+0x96	onenterbackward
+0x97	onenterforward
+0x98	ontimer
+0x99	options
+0x9A	password
+0x9B	reset
+0x9D	text
+0x9E	top
+0x9F	unknown
+0xA0	wrap
+0xA1	www.