diff --git a/src/dom/AttrNSImpl.cpp b/src/dom/AttrNSImpl.cpp
index 84134b720b589dc9a3ec6fed1303cf14c0f35c35..14766b425683856af7f710b116153d928e5a78b9 100644
--- a/src/dom/AttrNSImpl.cpp
+++ b/src/dom/AttrNSImpl.cpp
@@ -58,10 +58,12 @@
* $Id$
*/
+#include <util/XMLUniDefs.hpp>
#include "AttrNSImpl.hpp"
#include "DocumentImpl.hpp"
#include "DOM_DOMException.hpp"
+
AttrNSImpl::AttrNSImpl(DocumentImpl *ownerDoc, const DOMString &nam) :
AttrImpl(ownerDoc, name)
{
diff --git a/src/dom/ElementNSImpl.cpp b/src/dom/ElementNSImpl.cpp
index f79530f155c10d3696f6201e3b3145c4c17ef631..005f9bdb6cc7b092ee9ce5b2bcd41f02baf3fe52 100644
--- a/src/dom/ElementNSImpl.cpp
+++ b/src/dom/ElementNSImpl.cpp
@@ -58,6 +58,7 @@
* $Id$
*/
+#include <util/XMLUniDefs.hpp>
#include "ElementNSImpl.hpp"
#include "DocumentImpl.hpp"
#include "DOM_DOMException.hpp"
diff --git a/src/framework/XMLAttDef.cpp b/src/framework/XMLAttDef.cpp
index ea81d8f2b738adb0f8d20190210f04a5782cea3a..c003b096e7bb16ee98f911ef4554ad70ff3b8a73 100644
--- a/src/framework/XMLAttDef.cpp
+++ b/src/framework/XMLAttDef.cpp
@@ -55,21 +55,7 @@
*/
/**
- * $Log$
- * Revision 1.3 2000/03/02 19:54:24 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:46 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:26 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:34 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -77,6 +63,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <util/ArrayIndexOutOfBoundsException.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <framework/XMLAttDef.hpp>
diff --git a/src/framework/XMLAttr.cpp b/src/framework/XMLAttr.cpp
index baeb5b6e853c4b2e5c86b3266801a6a2b67f2b59..a4ee2d38d04bcd8baee6e9a1c9aa795b506694d7 100644
--- a/src/framework/XMLAttr.cpp
+++ b/src/framework/XMLAttr.cpp
@@ -55,38 +55,14 @@
*/
/**
- * $Log$
- * Revision 1.6 2000/04/10 22:42:52 roddey
- * Extended the buffer reuse to the QName field, to further increase
- * performance of attribute heavy applications.
- *
- * Revision 1.5 2000/03/28 19:43:16 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.4 2000/03/02 19:54:24 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:46 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/18 00:18:39 roddey
- * Fixed a small reported memory leak in destructor.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:28 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:35 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <framework/XMLAttr.hpp>
diff --git a/src/framework/XMLElementDecl.cpp b/src/framework/XMLElementDecl.cpp
index 150d90b6791dc97fd9fba03d7771d4f378bb7ccb..49ad0becd3e2528048b76295ec7da6f43705432a 100644
--- a/src/framework/XMLElementDecl.cpp
+++ b/src/framework/XMLElementDecl.cpp
@@ -55,27 +55,14 @@
*/
/**
- * $Log$
- * Revision 1.3 2000/05/11 23:11:32 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <sean.Macroibeaird@ireland.sun.com>
- *
- * Revision 1.2 2000/02/06 07:47:48 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:31 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:37 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <framework/XMLElementDecl.hpp>
diff --git a/src/framework/XMLEntityDecl.cpp b/src/framework/XMLEntityDecl.cpp
index 66ea7683c683bb7960289e915376913d791c3224..b0c57b4cccb936bf800216d94c9d6e9540ae87a8 100644
--- a/src/framework/XMLEntityDecl.cpp
+++ b/src/framework/XMLEntityDecl.cpp
@@ -55,22 +55,14 @@
*/
/**
- * $Log$
- * Revision 1.2 2000/02/06 07:47:48 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:32 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:38 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <framework/XMLEntityDecl.hpp>
diff --git a/src/framework/XMLFormatter.cpp b/src/framework/XMLFormatter.cpp
index 9a1d0b2bc569c1f303d6d5be6a66737bc0cb3283..735fed8fa870dc8740f66ea346f54dfc5647ed82 100644
--- a/src/framework/XMLFormatter.cpp
+++ b/src/framework/XMLFormatter.cpp
@@ -55,32 +55,7 @@
*/
/**
- * $Log$
- * Revision 1.6 2000/05/15 22:31:12 andyh
- * Replace #include<memory.h> with <string.h> everywhere.
- *
- * Revision 1.5 2000/04/07 01:01:55 roddey
- * Fixed an error message so that it indicated the correct radix for the rep
- * token. Get all of the basic output formatting functionality in place for
- * at least ICU and Win32 transcoders.
- *
- * Revision 1.4 2000/04/06 23:50:38 roddey
- * Now the low level formatter handles doing char refs for
- * unrepresentable chars (in addition to the replacement char style
- * already done.)
- *
- * Revision 1.3 2000/04/06 19:09:21 roddey
- * Some more improvements to output formatting. Now it will correctly
- * handle doing the 'replacement char' style of dealing with chars
- * that are unrepresentable.
- *
- * Revision 1.2 2000/04/05 00:20:16 roddey
- * More updates for the low level formatted output support
- *
- * Revision 1.1 2000/03/28 19:43:17 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
+ * $Id$
*/
@@ -88,6 +63,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <util/PlatformUtils.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLString.hpp>
#include <util/TransService.hpp>
#include <util/TranscodingException.hpp>
diff --git a/src/internal/ReaderMgr.cpp b/src/internal/ReaderMgr.cpp
index 52f11a72da33e75c64d7caa43937406424ab9ee3..6b634a9bcb4cec9735d9f4c74e24e1c37d334ca1 100644
--- a/src/internal/ReaderMgr.cpp
+++ b/src/internal/ReaderMgr.cpp
@@ -55,59 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.11 2000/03/20 19:12:23 roddey
- * Fixed bug in getLastExtEntityInfo(), to avoid null pointer problem
- * if an error is thrown very early in the parsing process (e.g. before
- * any file can get opened.
- *
- * Revision 1.10 2000/03/02 19:54:28 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.9 2000/02/24 02:12:54 aruna1
- * ReaderMgr:;getReaderDepth() added
- *
- * Revision 1.8 2000/02/22 00:36:50 roddey
- * Added a new 'native XMLCh' transcoder to correctly handle
- * internal entities now that XMLCh isn't always UTF-16.
- *
- * Revision 1.7 2000/02/06 07:47:53 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.6 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.5 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.4 2000/01/13 22:50:29 aruna1
- * For unix made additional check for relative url path
- *
- * Revision 1.3 2000/01/12 00:15:03 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.2 1999/12/18 00:20:00 roddey
- * More changes to support the new, completely orthagonal, support for
- * intrinsic encodings.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:11 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:56:54 droddey
- * If the main xml entity does not exist, we need to get the error handling for that
- * inside the main XMLScanner::scanDocument() try block so that it gets reported
- * in the normal way. We have to add a little extra safety code because, when this
- * happens, there is no reader on the reader stack to get position ino from.
- *
- * Revision 1.3 1999/11/08 20:44:43 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
@@ -119,6 +67,7 @@
#include <util/RuntimeException.hpp>
#include <util/UnexpectedEOFException.hpp>
#include <util/XMLURL.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/LocalFileInputSource.hpp>
diff --git a/src/internal/XMLReader.cpp b/src/internal/XMLReader.cpp
index b3da1ae7073179cfe3c11319c902db14b491e37d..b4a796b2e4160927ddf149651cef57c9a0ce42b1 100644
--- a/src/internal/XMLReader.cpp
+++ b/src/internal/XMLReader.cpp
@@ -55,79 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.18 2000/07/08 00:17:13 andyh
- * Cleanup of yesterday's speedup changes. Merged new bit into the
- * scanner character properties table.
- *
- * Revision 1.17 2000/07/07 01:08:44 andyh
- * Parser speed up in scan of XML content.
- *
- * Revision 1.16 2000/07/06 21:00:51 jpolast
- * inlined getNextCharIfNot() for better performance
- *
- * Revision 1.15 2000/05/15 22:31:15 andyh
- * Replace #include<memory.h> with <string.h> everywhere.
- *
- * Revision 1.14 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <sean.Macroibeaird@ireland.sun.com>
- *
- * Revision 1.13 2000/05/11 00:41:48 rahulj
- * Defect reported by SHOGO SAWAKI <shogo_sawaki@mx.nasw.mhi.co.jp>
- *
- * Revision 1.12 2000/03/28 19:43:18 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.11 2000/03/17 23:59:53 roddey
- * Initial updates for two way transcoding support
- *
- * Revision 1.10 2000/03/02 19:54:29 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.9 2000/02/14 19:27:07 roddey
- * Make an EBCDIC file without an encoding="" string an error.
- *
- * Revision 1.8 2000/02/06 07:47:53 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.7 2000/01/25 22:49:54 roddey
- * Moved the supportsSrcOfs() method from the individual transcoder to the
- * transcoding service, where it should have been to begin with.
- *
- * Revision 1.6 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.5 2000/01/22 00:01:07 roddey
- * Simple change to get rid of two hard coded 'x' type characters, which won't
- * work on EBCDIC systems.
- *
- * Revision 1.4 2000/01/12 23:52:45 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.3 1999/12/18 00:20:00 roddey
- * More changes to support the new, completely orthagonal, support for
- * intrinsic encodings.
- *
- * Revision 1.2 1999/12/15 19:48:03 roddey
- * Changed to use new split of transcoder interfaces into XML transcoders and
- * LCP transcoders, and implementation of intrinsic transcoders as pluggable
- * transcoders, and addition of Latin1 intrinsic support.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:20 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:44:45 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
@@ -142,6 +70,7 @@
#include <util/UTFDataFormatException.hpp>
#include <util/XMLEBCDICTranscoder.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/XMLBuffer.hpp>
diff --git a/src/internal/XMLReader.hpp b/src/internal/XMLReader.hpp
index dba7c8c6f402e2c360cd5e6bb937df13b6ac7f87..38ed5b5e1703a1d711fb7f932f9f2554c6bc428c 100644
--- a/src/internal/XMLReader.hpp
+++ b/src/internal/XMLReader.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2000/07/25 22:33:05 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.12 2000/07/08 00:17:13 andyh
* Cleanup of yesterday's speedup changes. Merged new bit into the
* scanner character properties table.
@@ -109,6 +112,7 @@
#if !defined(XMLREADER_HPP)
#define XMLREADER_HPP
+#include <util/XMLUniDefs.hpp>
#include <framework/XMLRecognizer.hpp>
#include <framework/XMLBuffer.hpp>
diff --git a/src/internal/XMLScanner.cpp b/src/internal/XMLScanner.cpp
index 789a07672ea7af9b71f117972a5a7a0de3281e32..c7183f8a2baf7ef4c5d4dd0d729fbcae180e8049 100644
--- a/src/internal/XMLScanner.cpp
+++ b/src/internal/XMLScanner.cpp
@@ -55,109 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.21 2000/07/20 18:46:29 jpolast
- * bug fix: call startDocument() at beginning of scan.
- * submitted by Erik Schroeder
- *
- * Revision 1.20 2000/07/17 22:47:40 jpolast
- * switched scanMisc() with endDoc() in scanNext()
- * pointed out by Dean Roddey
- *
- * Revision 1.19 2000/07/17 19:11:20 jpolast
- * fix for uninitialized variable gotData bug and endDocument bug.
- * Submitted by Jim Reitz (jereitz@home.com)
- *
- * Revision 1.18 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <sean.Macroibeaird@ireland.sun.com>
- *
- * Revision 1.17 2000/05/09 00:22:36 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.16 2000/05/05 01:44:29 rahulj
- * Fixed defect in progressive parsing 'parseNext()' reported by Tim
- * Johnston <tim@gntsoftware.com>. Fix provided by Dean Roddey.
- *
- * Revision 1.15 2000/04/19 00:04:33 roddey
- * Don't allow spaces before PI target. Bug #42
- *
- * Revision 1.14 2000/04/12 22:58:28 roddey
- * Added support for 'auto validate' mode.
- *
- * Revision 1.13 2000/03/03 22:32:51 roddey
- * Fixed a bug in SimpleContentModel that allowed an <a/> to be taken
- * as valid for a content model of (a,b).
- *
- * Revision 1.12 2000/03/03 01:29:32 roddey
- * Added a scanReset()/parseReset() method to the scanner and
- * parsers, to allow for reset after early exit from a progressive parse.
- * Added calls to new Terminate() call to all of the samples. Improved
- * documentation in SAX and DOM parsers.
- *
- * Revision 1.11 2000/03/02 19:54:30 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/29 22:54:46 aruna1
- * MultiThreaded problem for solaris with CC compiler resolved in
- * scanXMLDecl() function.
- *
- * Revision 1.9 2000/02/06 07:47:54 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.8 2000/01/19 00:55:45 roddey
- * Changes to get rid of dependence on old utils standard streams classes
- * and a small fix in the progressive parseFirst() call.
- *
- * Revision 1.7 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.6 2000/01/12 23:52:46 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.5 2000/01/12 00:15:04 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to
- * deal with the new URL class changes.
- *
- * Revision 1.4 1999/12/08 00:15:06 roddey
- * Some small last minute fixes to get into the 3.0.1 build that is going to
- * be going out anyway for platform fixes.
- *
- * Revision 1.3 1999/12/02 19:02:57 roddey
- * Get rid of a few statically defined XMLMutex objects, and lazy eval them
- * using atomic compare and swap. I somehow let it get by me that we don't
- * want any static/global objects at all.
- *
- * Revision 1.2 1999/11/30 20:23:13 roddey
- * Added changes to handle exceptions thrown from the user's handlers for
- * emitError().
- *
- * Revision 1.1.1.1 1999/11/09 01:08:22 twl
- * Initial checkin
- *
- * Revision 1.7 1999/11/08 20:56:54 droddey
- * If the main xml entity does not exist, we need to get the error handling
- * for that inside the main XMLScanner::scanDocument() try block so that it
- * gets reported in the normal way. We have to add a little extra safety
- * code because, when this happens, there is no reader on the reader stack
- * to get position ino from.
- *
- * Revision 1.6 1999/11/08 20:44:51 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -172,6 +70,7 @@
#include <util/UnexpectedEOFException.hpp>
#include <util/XMLDeleterFor.hpp>
#include <util/XMLMsgLoader.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLURL.hpp>
#include <sax/InputSource.hpp>
diff --git a/src/internal/XMLScanner2.cpp b/src/internal/XMLScanner2.cpp
index b28115e5408eb92e826e15c49f83ea9e68efc9d0..395a68d5ea3c3d624ae748338adcdfda54b98a4c 100644
--- a/src/internal/XMLScanner2.cpp
+++ b/src/internal/XMLScanner2.cpp
@@ -55,77 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.15 2000/07/08 00:17:13 andyh
- * Cleanup of yesterday's speedup changes. Merged new bit into the
- * scanner character properties table.
- *
- * Revision 1.14 2000/07/07 01:08:44 andyh
- * Parser speed up in scan of XML content.
- *
- * Revision 1.13 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <sean.Macroibeaird@ireland.sun.com>
- *
- * Revision 1.12 2000/04/12 22:58:28 roddey
- * Added support for 'auto validate' mode.
- *
- * Revision 1.11 2000/03/02 19:54:30 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/06 07:47:54 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.9 2000/01/28 19:09:19 roddey
- * The API is no in place to allow client code to make sense of start/end entity
- * ref calls from attribute values. So supress them for now.
- *
- * Revision 1.8 2000/01/27 23:20:33 roddey
- * If an entity ends on the last > of some markup, then the end of entity
- * won't be sent because the end of entity is not sensed.
- *
- * Revision 1.7 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.6 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.5 2000/01/12 23:52:46 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.4 2000/01/12 00:15:04 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.3 1999/12/18 00:20:24 roddey
- * Fixed a small reported memory leak
- *
- * Revision 1.2 1999/12/08 00:15:07 roddey
- * Some small last minute fixes to get into the 3.0.1 build that is going to be
- * going out anyway for platform fixes.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:24 twl
- * Initial checkin
- *
- * Revision 1.6 1999/11/08 20:56:55 droddey
- * If the main xml entity does not exist, we need to get the error handling for that
- * inside the main XMLScanner::scanDocument() try block so that it gets reported
- * in the normal way. We have to add a little extra safety code because, when this
- * happens, there is no reader on the reader stack to get position ino from.
- *
- * Revision 1.5 1999/11/08 20:44:52 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -142,6 +72,7 @@
#include <util/Janitor.hpp>
#include <util/PlatformUtils.hpp>
#include <util/UnexpectedEOFException.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/XMLErrorReporter.hpp>
diff --git a/src/parsers/DOMParser.cpp b/src/parsers/DOMParser.cpp
index 81b532d1b5fb8cc6601861d2a87b2a2ed6451d31..166ead8ef0e2992874a7b5d66cbacd4b03518dc1 100644
--- a/src/parsers/DOMParser.cpp
+++ b/src/parsers/DOMParser.cpp
@@ -69,6 +69,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <sax/EntityResolver.hpp>
+#include <util/XMLUniDefs.hpp>
#include <sax/ErrorHandler.hpp>
#include <sax/SAXParseException.hpp>
#include <framework/XMLNotationDecl.hpp>
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 6b630f1fffd18f6a1d5334b82e7f647d51804933..939e6c68b5cd1912c0c2026973ba1c5b1d2c3fef 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.25 2000/07/25 22:28:15 aruna1
+# Char definitions in XMLUni moved to XMLUniDefs
+#
# Revision 1.24 2000/06/27 22:11:41 jpolast
# added HashBase, HashXMLCh, HashPtr
#
@@ -257,6 +260,7 @@ UTIL_CPP_PUBHEADERS = \
XMLURL.hpp \
XMLUTF16Transcoder.hpp \
XMLUTF8Transcoder.hpp \
+ XMLUniDefs.hpp \
XMLUni.hpp \
XMLWin1252Transcoder.hpp
diff --git a/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp b/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
index e14155e40cdaf20cff5aee8d269ac050a0dbc035..0f4883373dea0e3061651e3a1bf87e546e7a0206 100644
--- a/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
+++ b/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2000/07/25 22:28:40 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.5 2000/03/02 19:55:16 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -86,6 +89,7 @@
#include <util/PlatformUtils.hpp>
#include <util/XMLMsgLoader.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include "MsgCatalogLoader.hpp"
#include "XMLMsgCat_Ids.hpp"
diff --git a/src/util/MsgLoaders/MsgFile/MsgLoader.cpp b/src/util/MsgLoaders/MsgFile/MsgLoader.cpp
index 9b05e0d9f63405d5a3fb0afe67290568e8f71f65..fcc23eb34f7d6b0981ed13982b2292bd58737e22 100644
--- a/src/util/MsgLoaders/MsgFile/MsgLoader.cpp
+++ b/src/util/MsgLoaders/MsgFile/MsgLoader.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2000/07/25 22:28:47 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.3 2000/03/02 19:55:17 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -73,6 +76,7 @@
#include <util/PlatformUtils.hpp>
#include <util/XMLMsgLoader.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include "MsgLoader.hpp"
#include "XMLMessages.h"
diff --git a/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp b/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp
index 50e4985eb3d71e0fab5ea349035a8c95ea8bbb30..dcaf28f53b4e6859153987b5b952cc6dd3612364 100644
--- a/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp
+++ b/src/util/MsgLoaders/Win32/Win32MsgLoader.cpp
@@ -55,25 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.4 2000/03/28 19:43:23 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.3 2000/03/02 19:55:18 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:48:24 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:07:15 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:45:28 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
diff --git a/src/util/NetAccessors/Socket/SocketNetAccessor.cpp b/src/util/NetAccessors/Socket/SocketNetAccessor.cpp
index 348698a35e3525a3d7f923567e89ea89adadebbb..baaf67305aae7a213019261822b4c7b459dd1857 100644
--- a/src/util/NetAccessors/Socket/SocketNetAccessor.cpp
+++ b/src/util/NetAccessors/Socket/SocketNetAccessor.cpp
@@ -55,19 +55,10 @@
*/
/*
- * $Log$
- * Revision 1.1 2000/03/20 23:48:51 rahulj
- * Added Socket based NetAccessor. This will enable one to
- * use HTTP URL's for system id's. Default build options do
- * not use this NetAccessor. Specify the '-n socket' option
- * to 'runConfigure' to configure Xerces-C to use this new
- * feature. The code works under Solaris 2.6, Linux, AIX
- * and HPUX 11 with aCC.
- * Todo's: enable proper error handling.
- *
+ * $Id$
*/
-
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <util/XMLExceptMsgs.hpp>
diff --git a/src/util/NetAccessors/WinSock/WinSockNetAccessor.cpp b/src/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
index a6334f12ba49b033b26921d60689f9282b448e1c..d31649facc18ccc5a7733d490d84e67eee72f909 100644
--- a/src/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
+++ b/src/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
@@ -55,21 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.2 2000/03/22 00:21:10 rahulj
- * Now we throw exceptions when errors occur.
- * Simplified the code, based on the assumption that
- * the calling function will make sure that the buffer into
- * which the data has to be read is large enough.
- *
- * Revision 1.1 2000/03/17 02:37:54 rahulj
- * First cut at adding HTTP capability via native sockets.
- * Still need to add:
- * error handling capability, ports other than 80,
- * escaped URL's
- * Will add options in project file only when I am done with these
- * above changes.
- *
+ * $Id$
*/
@@ -78,6 +64,7 @@
#include <winsock2.h>
#include <windows.h>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <util/XMLExceptMsgs.hpp>
diff --git a/src/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp b/src/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
index 1f81c4208854861ebd1d776d73dc91d68495bcbf..55089d7bc9215ab7b267cd75178cde872c16487b 100644
--- a/src/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
+++ b/src/util/NetAccessors/libWWW/LibWWWNetAccessor.cpp
@@ -55,18 +55,7 @@
*/
/**
- * $Log$
- * Revision 1.1 2000/02/17 22:06:19 rahulj
- * Moved the four LibWWW files to its own sub-directory in the
- * NetAccessor directory.
- *
- *
- * Revision 1.1 2000/01/15 01:08:04 rahulj
- * Added support for HTTP to the parser.
- * Error handling is not very good. Also cannot guarantee that
- * there are no memory leaks.
- * Only tested under NT 4.0 SP 5 using libWWW 5.2.8.
- *
+ * $Id$
*/
diff --git a/src/util/Platforms/AIX/AIXPlatformUtils.cpp b/src/util/Platforms/AIX/AIXPlatformUtils.cpp
index e7571f677b036eec51cf3cb033ce9195ae774437..8185089deeec9d84cd88f9eb1a82739a62f4c4d8 100644
--- a/src/util/Platforms/AIX/AIXPlatformUtils.cpp
+++ b/src/util/Platforms/AIX/AIXPlatformUtils.cpp
@@ -55,67 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.16 2000/03/20 23:48:51 rahulj
- * Added Socket based NetAccessor. This will enable one to
- * use HTTP URL's for system id's. Default build options do
- * not use this NetAccessor. Specify the '-n socket' option
- * to 'runConfigure' to configure Xerces-C to use this new
- * feature. The code works under Solaris 2.6, Linux, AIX
- * and HPUX 11 with aCC.
- * Todo's: enable proper error handling.
- *
- * Revision 1.15 2000/03/17 23:59:59 roddey
- * Initial updates for two way transcoding support
- *
- * Revision 1.14 2000/03/02 21:10:35 abagchi
- * Added empty function platformTerm()
- *
- * Revision 1.13 2000/03/02 19:55:19 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.12 2000/02/10 21:47:00 aruna1
- * getFullPath janitor rectification
- *
- * Revision 1.11 2000/02/06 07:48:26 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.10 2000/01/25 22:32:17 aruna1
- * Updated panic information
- *
- * Revision 1.9 2000/01/20 19:37:36 aruna1
- * fgLibLocation and writeTo functions eliminated
- *
- * Revision 1.8 2000/01/19 18:16:12 abagchi
- * Removed the streaming classes and fgLibLocation
- *
- * Revision 1.7 2000/01/14 02:18:33 aruna1
- * modified absolute path creation on heap
- *
- * Revision 1.6 2000/01/13 22:17:23 aruna1
- * getBasePath changed to getFullPath and now returns the full absolute path
- * WeavePath added
- *
- * Revision 1.5 1999/12/23 00:41:28 aruna1
- * Library search path corrected
- *
- * Revision 1.4 1999/12/03 02:35:22 aruna1
- * mutex recursive attribute introduced in makeMutex
- *
- * Revision 1.3 1999/12/01 02:55:42 aruna1
- * Added panic calls and modified makeTransService for AIX
- *
- * Revision 1.2 1999/11/23 02:00:34 rahulj
- * Code now works under HPUX 11. Tested inmemory message loader.Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
- *
- * Revision 1.1.1.1 1999/11/09 01:07:11 twl
- * Initial checkin
- *
- * Revision 1.6 1999/11/08 20:45:29 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -141,6 +81,7 @@
#include <util/RuntimeException.hpp>
#include <util/Janitor.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#if defined (XML_USE_ICU_TRANSCODER)
#include <util/Transcoders/ICU/ICUTransService.hpp>
diff --git a/src/util/Platforms/HPUX/HPPlatformUtils.cpp b/src/util/Platforms/HPUX/HPPlatformUtils.cpp
index b6c3239c19bd92004646b1323f64c5083d671906..e4383067cbd3b3504590a0a32432e01bd4e7afa6 100644
--- a/src/util/Platforms/HPUX/HPPlatformUtils.cpp
+++ b/src/util/Platforms/HPUX/HPPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2000/07/25 22:29:36 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.13 2000/03/24 00:16:00 aruna1
* Platform initialization taken care for both threaded and non-threaded environment
*
@@ -138,6 +141,7 @@
#include <limits.h>
#include <unistd.h>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
diff --git a/src/util/Platforms/IRIX/IRIXPlatformUtils.cpp b/src/util/Platforms/IRIX/IRIXPlatformUtils.cpp
index 107acb303124ad0f7643398ed4542a3155505b0c..131b3d3a5a1116203ffff5955adc4ade5feb7c22 100644
--- a/src/util/Platforms/IRIX/IRIXPlatformUtils.cpp
+++ b/src/util/Platforms/IRIX/IRIXPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2000/07/25 22:29:45 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.9 2000/04/03 19:27:19 abagchi
* Included changes for SGI IRIX 6.5
*
@@ -114,6 +117,7 @@
#include <util/Janitor.hpp>
#include <util/Mutexes.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#if defined(XML_USE_ICU_TRANSCODER)
diff --git a/src/util/Platforms/Linux/LinuxPlatformUtils.cpp b/src/util/Platforms/Linux/LinuxPlatformUtils.cpp
index 8d91cbca423be7c1ab2ff0cd6b3a4043b3aed316..33055231385331ce6b15045b34d53ea4d8c70e5a 100644
--- a/src/util/Platforms/Linux/LinuxPlatformUtils.cpp
+++ b/src/util/Platforms/Linux/LinuxPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2000/07/25 22:29:55 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.16 2000/03/24 00:13:03 aruna1
* Platform initialization taken care for both threaded and non-threaded environment
*
@@ -149,6 +152,7 @@
#include <util/Janitor.hpp>
#include <util/Mutexes.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#if defined(XML_USE_ICU_TRANSCODER)
diff --git a/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp b/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp
index 95d50c0e6e5f91dc38526d77313fc3cfe0fb2ad6..416df7f81de4e2ea67f03f80115e802b06854fb1 100644
--- a/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp
+++ b/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2000/07/25 22:30:07 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.6 2000/07/19 18:47:34 andyh
* More Macintosh port tweaks, submitted by James Berry.
*
@@ -98,6 +101,7 @@
#include <util/Janitor.hpp>
#include <util/PlatformUtils.hpp>
#include <util/RuntimeException.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <util/Platforms/MacOS/MacOSDefs.hpp>
diff --git a/src/util/Platforms/OS2/OS2PlatformUtils.cpp b/src/util/Platforms/OS2/OS2PlatformUtils.cpp
index 75a45cda71c2f9c44da1fe7b92ab7e4bfa02febc..8eba7d1d285627078d26c79d7dfe927e81a7887d 100644
--- a/src/util/Platforms/OS2/OS2PlatformUtils.cpp
+++ b/src/util/Platforms/OS2/OS2PlatformUtils.cpp
@@ -71,11 +71,13 @@
#define INCL_DOSMISC
#define INCL_DOSFILEMGR
+#include <util/XercesDefs.hpp>
#include <util/PlatformUtils.hpp>
#include <util/RuntimeException.hpp>
#include <util/Janitor.hpp>
#include <util/XMLString.hpp>
-#include <util/XercesDefs.hpp>
+#include <util/XMLUniDefs.hpp>
+
#include <stdio.h>
#include <stdlib.h>
#include <io.h>
diff --git a/src/util/Platforms/OS390/OS390PlatformUtils.cpp b/src/util/Platforms/OS390/OS390PlatformUtils.cpp
index 732df6b8961cf7dcca8a58c126cd39da98c44b6e..da41da3c3292bd647eeb1efb139fcb256f813527 100644
--- a/src/util/Platforms/OS390/OS390PlatformUtils.cpp
+++ b/src/util/Platforms/OS390/OS390PlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2000/07/25 22:30:24 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.12 2000/03/18 00:00:00 roddey
* Initial updates for two way transcoding support
*
@@ -121,6 +124,7 @@
#include <unistd.h>
#include <limits.h>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#if defined (XML_USE_ICU_TRANSCODER)
diff --git a/src/util/Platforms/OS400/OS400PlatformUtils.cpp b/src/util/Platforms/OS400/OS400PlatformUtils.cpp
index 5cdd3c42eb4bf6e99d9ffcaa42a15aec918bdd2f..95f0c4e2f49c6bf151e223497a3c02a2b3fec932 100644
--- a/src/util/Platforms/OS400/OS400PlatformUtils.cpp
+++ b/src/util/Platforms/OS400/OS400PlatformUtils.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.4 2000/07/25 22:30:33 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.3 2000/03/18 00:00:01 roddey
* Initial updates for two way transcoding support
*
@@ -77,6 +80,7 @@
#include <util/RuntimeException.hpp>
#include <util/Janitor.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/src/util/Platforms/Solaris/SolarisPlatformUtils.cpp b/src/util/Platforms/Solaris/SolarisPlatformUtils.cpp
index 093b67d34cad044e4e41b07f577646d863836081..e11ae50628d93b74974af927170d703ec837cb44 100644
--- a/src/util/Platforms/Solaris/SolarisPlatformUtils.cpp
+++ b/src/util/Platforms/Solaris/SolarisPlatformUtils.cpp
@@ -55,70 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.17 2000/03/24 00:13:18 aruna1
- * Platform initialization taken care for both threaded and non-threaded environment
- *
- * Revision 1.16 2000/03/20 23:48:52 rahulj
- * Added Socket based NetAccessor. This will enable one to
- * use HTTP URL's for system id's. Default build options do
- * not use this NetAccessor. Specify the '-n socket' option
- * to 'runConfigure' to configure Xerces-C to use this new
- * feature. The code works under Solaris 2.6, Linux, AIX
- * and HPUX 11 with aCC.
- * Todo's: enable proper error handling.
- *
- * Revision 1.15 2000/03/18 00:00:02 roddey
- * Initial updates for two way transcoding support
- *
- * Revision 1.14 2000/03/02 21:10:38 abagchi
- * Added empty function platformTerm()
- *
- * Revision 1.13 2000/03/02 20:42:41 abagchi
- * Fixed typo in XMLExcepts
- *
- * Revision 1.12 2000/03/02 19:55:30 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.11 2000/02/10 21:46:48 aruna1
- * getFullPath janitor rectification
- *
- * Revision 1.10 2000/02/06 07:48:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.9 2000/01/25 22:33:05 aruna1
- * Updated panic information
- *
- * Revision 1.7 2000/01/21 20:04:00 abagchi
- * Removed the code for loadAMsgSet() when invoked with ICU
- *
- * Revision 1.6 2000/01/19 18:10:14 abagchi
- * Removed the streaming classes and fgLibLocation
- *
- * Revision 1.5 2000/01/14 02:51:34 aruna1
- * Modified for FullPath, weavePath, openFile
- *
- * Revision 1.4 1999/12/08 23:10:07 aruna1
- * Recursive locking mechanism added
- *
- * Revision 1.3 1999/12/02 23:07:13 aruna1
- * Solaris Atomic Mutex initailization changed to native calls
- *
- * Revision 1.2 1999/11/19 23:50:56 aruna1
- * added changes for platformInit and makeTransService functions
- * PR:
- * Obtained from:
- * Submitted by:
- * Reviewed by:
- *
- * Revision 1.1.1.1 1999/11/09 01:06:31 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:45:32 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -146,6 +83,7 @@
#include <util/RuntimeException.hpp>
#include <util/Mutexes.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#if defined (XML_USE_ICU_TRANSCODER)
diff --git a/src/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp b/src/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
index 2de9b23a15a89ed2a02ebe5cfed74fe8fa684284..7542a60807311a7c1f0f0ac82d8a4c3f17ff8597 100644
--- a/src/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
+++ b/src/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2000/07/25 22:30:54 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.7 2000/03/24 00:13:34 aruna1
* Platform initialization taken care for both threaded and non-threaded environment
*
@@ -107,6 +110,7 @@
#include <util/RuntimeException.hpp>
#include <util/Mutexes.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#if defined (XML_USE_ICU_TRANSCODER)
diff --git a/src/util/Platforms/Win32/Win32PlatformUtils.cpp b/src/util/Platforms/Win32/Win32PlatformUtils.cpp
index 45595b48bd1198dc4e78236031947eaf199eec64..c27f10d92a473c99b4dce15911655f48ed3004d4 100644
--- a/src/util/Platforms/Win32/Win32PlatformUtils.cpp
+++ b/src/util/Platforms/Win32/Win32PlatformUtils.cpp
@@ -55,108 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.23 2000/05/31 22:56:51 andyh
- * Fixed error check for end of file in Win32 platform utils.
- * Joe Polastre
- *
- * Revision 1.22 2000/05/10 00:39:20 andyh
- * Japanese and Korean Encoding Problems with WIndows
- * file names. Win98 fix, and relative paths fix.
- *
- * Revision 1.21 2000/05/09 00:22:41 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.20 2000/04/18 23:26:01 andyh
- * Fix problem on NT with conflict between Korean Won Sign (0x20A9)
- * and backslash in file path names.
- *
- * Revision 1.19 2000/04/18 17:57:29 roddey
- * Fix signature of ::fileSize() method. Bug #119
- *
- * Revision 1.18 2000/04/11 19:11:55 roddey
- * Replace Yen signs with backslash in wide char path names
- * under NT. This avoids ambiguous code point in some asian
- * encodings.
- *
- * Revision 1.17 2000/04/05 18:55:36 roddey
- * Delete the critical section handle in closeMutex().
- *
- * Revision 1.16 2000/03/20 23:43:03 rahulj
- * Expanded tabs to spaces.
- *
- * Revision 1.15 2000/03/18 00:00:02 roddey
- * Initial updates for two way transcoding support
- *
- * Revision 1.14 2000/03/17 02:37:55 rahulj
- * First cut at adding HTTP capability via native sockets.
- * Still need to add:
- * error handling capability, ports other than 80,
- * escaped URL's
- * Will add options in project file only when I am done with these
- * above changes.
- *
- * Revision 1.13 2000/03/02 19:55:34 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.12 2000/02/06 07:48:32 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.11 2000/01/31 23:53:14 roddey
- * Since all synchronization inside the parser is intraprocess, the Win32 mutex
- * implementation was changed to use critical sections for speed.
- *
- * Revision 1.10 2000/01/25 21:34:45 roddey
- * Added support for the two new panic errors.
- *
- * Revision 1.9 2000/01/22 00:03:47 roddey
- * Added a check for a broken pipe error on file read. This allows folks to support
- * a pipe as an input source and not die when the other side drops the sending
- * end of the pipe.
- *
- * Revision 1.8 2000/01/20 20:37:25 andyh
- * Remove DEVENV_VCPP preprocessor variable everywhere.
- * It was obsolete, left over from an earlier configuration system.
- * And it was not set correctly in all projects.
- *
- * Should fix build problem reported by some with use of
- * InterlockedCompareExchange() on Windows with VC6.
- *
- * Revision 1.7 2000/01/19 00:57:26 roddey
- * Changes to get rid of dependence on old utils standard streams and to
- * get rid of the fgLibLocation stuff.
- *
- * Revision 1.6 2000/01/15 01:26:18 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.5 2000/01/14 19:48:34 andyh
- * Update MSVC project files to reflect change in DLL version to 1_1
- * Update dll name in panic message text from XML4C to Xerces
- *
- * Revision 1.4 2000/01/13 20:07:10 roddey
- * Just a trivial fix of a misspelling in one of the panic messages.
- *
- * Revision 1.3 2000/01/12 00:16:47 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.2 1999/11/22 20:41:26 abagchi
- * Changed 'intlFiles/Locales' to 'icu/data'
- *
- * Revision 1.1.1.1 1999/11/09 01:06:21 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:45:33 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
@@ -167,6 +66,7 @@
#include <util/RuntimeException.hpp>
#include <util/XMLExceptMsgs.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <windows.h>
diff --git a/src/util/TransService.cpp b/src/util/TransService.cpp
index f395b40374318f7acf92635ba565bdcd07e510a4..9c71ceb7626779188e409d889543264b0a28dc11 100644
--- a/src/util/TransService.cpp
+++ b/src/util/TransService.cpp
@@ -71,6 +71,7 @@
#include <util/XMLUTF8Transcoder.hpp>
#include <util/XMLUTF16Transcoder.hpp>
#include <util/XMLWin1252Transcoder.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/TransENameMap.hpp>
diff --git a/src/util/Transcoders/ICU/ICUTransService.cpp b/src/util/Transcoders/ICU/ICUTransService.cpp
index 7f83f1a795d005faf6862bedab26f53b6040fc17..1280ce41f1bacf6f3f6ad37ff50c6b0e0be2f50b 100644
--- a/src/util/Transcoders/ICU/ICUTransService.cpp
+++ b/src/util/Transcoders/ICU/ICUTransService.cpp
@@ -65,6 +65,7 @@
#include <util/Janitor.hpp>
#include <util/TranscodingException.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include "ICUTransService.hpp"
#include <string.h>
#include <unicode/uloc.h>
diff --git a/src/util/Transcoders/Iconv/IconvTransService.cpp b/src/util/Transcoders/Iconv/IconvTransService.cpp
index 9810a817f171a09749f6b0a367dab72a1afb1fd7..da47800f58e8ce356f6c3898e09f7decb3779c58 100644
--- a/src/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/util/Transcoders/Iconv/IconvTransService.cpp
@@ -55,90 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.18 2000/06/09 23:45:02 rahulj
- * More PTX port related changes submitted by
- * Sumit Chawla <sumitc@us.ibm.com>.
- *
- * Revision 1.17 2000/03/28 19:43:24 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.16 2000/03/13 21:48:04 abagchi
- * Changed XML_GNUG to XML_GCC
- *
- * Revision 1.15 2000/03/02 19:55:35 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.14 2000/02/16 18:37:03 aruna1
- * Made changes to upperCase function in Transcoding services
- *
- * Revision 1.13 2000/02/11 03:10:19 rahulj
- * Fixed defect in compare[N]IString function. Defect and fix reported
- * by Bill Schindler from developer@bitranch.com.
- * Replaced tabs with appropriate number of spaces.
- *
- * Revision 1.12 2000/02/06 07:48:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.11 2000/01/25 22:49:57 roddey
- * Moved the supportsSrcOfs() method from the individual transcoder to the
- * transcoding service, where it should have been to begin with.
- *
- * Revision 1.10 2000/01/25 20:56:51 abagchi
- * Now at least compiles
- *
- * Revision 1.9 2000/01/25 19:19:08 roddey
- * Simple addition of a getId() method to the xcode and netacess abstractions to
- * allow each impl to give back an id string.
- *
- * Revision 1.8 2000/01/06 01:21:34 aruna1
- * Transcoding services modified.
- *
- * Revision 1.7 2000/01/05 23:30:38 abagchi
- * Fixed the new class IconvLCPTranscoder functions. Tested on Linux only.
- *
- * Revision 1.6 1999/12/18 00:22:32 roddey
- * Changes to support the new, completely orthagonal, transcoder architecture.
- *
- * Revision 1.5 1999/12/14 23:53:35 rahulj
- * Removed the offending Ctrl-M's from the commit message
- * logs which was giving packaging problems.
- *
- * PR:
- * Obtained from:
- * Submitted by:
- * Reviewed by:
- *
- * Revision 1.4 1999/12/02 20:20:16 rahulj
- * Fixed incorrect comparision of int with a pointer.
- * Got burnt because definition of NULL varies on different platforms,
- * though use of NULL was not correct in the first place.
- *
- * Revision 1.3 1999/11/20 00:28:19 rahulj
- * Added code for case-insensitive wide character string compares
- *
- * Revision 1.2 1999/11/17 21:52:49 abagchi
- * Changed wcscasecmp() to wcscmp() to make it work on Solaris and AIX
- * PR:
- * Obtained from:
- * Submitted by:
- * Reviewed by:
- *
- * Revision 1.1.1.1 1999/11/09 01:06:10 twl
- * Initial checkin
- *
- * Revision 1.7 1999/11/08 20:45:34 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include "IconvTransService.hpp"
#include <wchar.h>
diff --git a/src/util/Transcoders/Iconv390/Iconv390TransService.cpp b/src/util/Transcoders/Iconv390/Iconv390TransService.cpp
index fe06769ce35294f7d1ec32efe67ceb707319c4c0..ce838e09e83e6e976b52d1aaf0d244a17c64629b 100644
--- a/src/util/Transcoders/Iconv390/Iconv390TransService.cpp
+++ b/src/util/Transcoders/Iconv390/Iconv390TransService.cpp
@@ -55,39 +55,14 @@
*/
/*
- * $Log$
- * Revision 1.7 2000/03/02 19:55:35 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/14 19:32:15 abagchi
- * Reintroduced bug-fix in 1.4
- *
- * Revision 1.5 2000/02/14 17:59:49 abagchi
- * Reused iconv descriptors
- *
- * Revision 1.4 2000/02/11 03:10:20 rahulj
- * Fixed defect in compare[N]IString function. Defect and fix reported
- * by Bill Schindler from developer@bitranch.com.
- * Replaced tabs with appropriate number of spaces.
- *
- * Revision 1.3 2000/02/10 00:23:04 abagchi
- * Eliminated references to ibm-1047
- *
- * Revision 1.2 2000/02/09 01:31:22 abagchi
- * Fixed calcRequiredSize() for OS390BATCH
- *
- * Revision 1.1 2000/02/08 02:14:11 abagchi
- * Initial checkin
- *
- *
+ * $Id$
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include "Iconv390TransService.hpp"
diff --git a/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp b/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
index 186045a2408f0b98a14d34686e59ab0fb2f78fcb..95032708cb4178456419cf0e084ede9cc0bd2685 100644
--- a/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
+++ b/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.2 2000/07/25 22:31:26 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.1 2000/07/18 18:26:15 andyh
* Mac OS update.
* Contributed by James Berry <jberry@criticalpath.com>
@@ -101,6 +104,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <MacOSUnicodeConverter.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLString.hpp>
#include <util/TranscodingException.hpp>
diff --git a/src/util/Transcoders/Win32/Win32TransService.cpp b/src/util/Transcoders/Win32/Win32TransService.cpp
index d21cb148076d4a56ab579e6a716fb953be450185..f033c6019fbe1116bfd060697402c32e9ebb1cb6 100644
--- a/src/util/Transcoders/Win32/Win32TransService.cpp
+++ b/src/util/Transcoders/Win32/Win32TransService.cpp
@@ -66,6 +66,7 @@
#include <util/TranscodingException.hpp>
#include <util/XMLException.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/RefHashTableOf.hpp>
#include "Win32TransService.hpp"
diff --git a/src/util/XMLException.cpp b/src/util/XMLException.cpp
index 800c6a8add0cd05dcc0d59be2b3e0f49437fc3cc..f28bea496f2b0548077c7d42881acddb2b84aba9 100644
--- a/src/util/XMLException.cpp
+++ b/src/util/XMLException.cpp
@@ -55,32 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.5 2000/05/09 00:22:40 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.4 2000/03/02 19:54:48 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:48:05 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 1999/12/02 19:02:57 roddey
- * Get rid of a few statically defined XMLMutex objects, and lazy eval them
- * using atomic compare and swap. I somehow let it get by me that we don't
- * want any static/global objects at all.
- *
- * Revision 1.1.1.1 1999/11/09 01:05:39 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:45:19 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -93,6 +68,7 @@
#include <util/XMLException.hpp>
#include <util/XMLMsgLoader.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
diff --git a/src/util/XMLString.cpp b/src/util/XMLString.cpp
index 741a1b0873a325f172bb7e61639d73daa58ec3f0..e1717d91f1300174d2f7e6c84c89fdc3faddfbb8 100644
--- a/src/util/XMLString.cpp
+++ b/src/util/XMLString.cpp
@@ -55,48 +55,7 @@
*/
/*
- * $Log$
- * Revision 1.10 2000/06/12 22:36:30 andyh
- * Fixed error in XMLSTring::trim, reported by Michele Laghi
- *
- * Revision 1.9 2000/05/15 22:31:22 andyh
- * Replace #include<memory.h> with <string.h> everywhere.
- *
- * Revision 1.8 2000/03/23 01:02:38 roddey
- * Updates to the XMLURL class to correct a lot of parsing problems
- * and to add support for the port number. Updated the URL tests
- * to test some of this new stuff.
- *
- * Revision 1.7 2000/03/02 19:54:49 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/06 07:48:06 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.5 2000/01/19 00:56:59 roddey
- * Changes to get rid of dependence on old utils standard streams and to
- * get rid of the fgLibLocation stuff.
- *
- * Revision 1.4 2000/01/12 00:16:23 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.3 1999/12/18 00:18:10 roddey
- * More changes to support the new, completely orthagonal support for
- * intrinsic encodings.
- *
- * Revision 1.2 1999/12/15 19:41:28 roddey
- * Support for the new transcoder system, where even intrinsic encodings are
- * done via the same transcoder abstraction as external ones.
- *
- * Revision 1.1.1.1 1999/11/09 01:05:51 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:45:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id$
*/
@@ -113,6 +72,7 @@
#include <util/TranscodingException.hpp>
#include <util/ValueArrayOf.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
diff --git a/src/util/XMLURL.cpp b/src/util/XMLURL.cpp
index 15b8f96273f4382899b60762cb5b0b7323c74532..59c1536c5c4aa28b967c23cf96c32aed4ce43f15 100644
--- a/src/util/XMLURL.cpp
+++ b/src/util/XMLURL.cpp
@@ -70,6 +70,7 @@
#include <util/XMLURL.hpp>
#include <util/XMLNetAccessor.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
diff --git a/src/util/XMLUTF8Transcoder.cpp b/src/util/XMLUTF8Transcoder.cpp
index 83e0cb10e7ff6742480a98d15e6dcd6e916b2a2d..d5068e3aee26ff0c17262847b842f227abf30206 100644
--- a/src/util/XMLUTF8Transcoder.cpp
+++ b/src/util/XMLUTF8Transcoder.cpp
@@ -54,12 +54,16 @@
* <http://www.apache.org/>.
*/
+/**
+ * $Id$
+ */
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
#include <util/TranscodingException.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUTF8Transcoder.hpp>
#include <util/UTFDataFormatException.hpp>
diff --git a/src/util/XMLUni.cpp b/src/util/XMLUni.cpp
index a512b41fabe4363af259e9bc86399bf1885a55ba..48ee19bd75a82fa1dd46a9cbf91b94e83eba19f8 100644
--- a/src/util/XMLUni.cpp
+++ b/src/util/XMLUni.cpp
@@ -63,6 +63,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <util/XercesDefs.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
diff --git a/src/util/XMLUni.hpp b/src/util/XMLUni.hpp
index fd6e65edbcf309225e0a2527b2cb19384c5bbab8..5ae751ad73b5fc01d4c54b02e689900dc51768a7 100644
--- a/src/util/XMLUni.hpp
+++ b/src/util/XMLUni.hpp
@@ -72,122 +72,6 @@
#include <util/XercesDefs.hpp>
-// ---------------------------------------------------------------------------
-// Constants for the Unicode characters of interest to us in an XML parser
-// We don't put these inside the class because then they could not be const
-// inline values, which would have significant performance ramifications.
-//
-// We cannot use a namespace because of the requirement to support old
-// compilers.
-// ---------------------------------------------------------------------------
-const XMLCh chNull = 0x00;
-const XMLCh chHTab = 0x09;
-const XMLCh chLF = 0x0A;
-const XMLCh chCR = 0x0D;
-const XMLCh chAmpersand = 0x26;
-const XMLCh chAsterisk = 0x2A;
-const XMLCh chAt = 0x40;
-const XMLCh chBackSlash = 0x5C;
-const XMLCh chBang = 0x21;
-const XMLCh chCloseAngle = 0x3E;
-const XMLCh chCloseCurly = 0x7D;
-const XMLCh chCloseParen = 0x29;
-const XMLCh chCloseSquare = 0x5D;
-const XMLCh chColon = 0x3A;
-const XMLCh chComma = 0x2C;
-const XMLCh chDash = 0x2D;
-const XMLCh chDollarSign = 0x24;
-const XMLCh chDoubleQuote = 0x22;
-const XMLCh chEqual = 0x3D;
-const XMLCh chForwardSlash = 0x2F;
-const XMLCh chGrave = 0x60;
-const XMLCh chOpenAngle = 0x3C;
-const XMLCh chOpenCurly = 0x7B;
-const XMLCh chOpenParen = 0x28;
-const XMLCh chOpenSquare = 0x5B;
-const XMLCh chPercent = 0x25;
-const XMLCh chPeriod = 0x2E;
-const XMLCh chPipe = 0x7C;
-const XMLCh chPlus = 0x2B;
-const XMLCh chPound = 0x23;
-const XMLCh chQuestion = 0x3F;
-const XMLCh chSingleQuote = 0x27;
-const XMLCh chSpace = 0x20;
-const XMLCh chSemiColon = 0x3B;
-const XMLCh chTilde = 0x7E;
-const XMLCh chUnderscore = 0x5F;
-
-const XMLCh chSwappedUnicodeMarker = XMLCh(0xFFFE);
-const XMLCh chUnicodeMarker = XMLCh(0xFEFF);
-
-const XMLCh chDigit_0 = 0x30;
-const XMLCh chDigit_1 = 0x31;
-const XMLCh chDigit_2 = 0x32;
-const XMLCh chDigit_3 = 0x33;
-const XMLCh chDigit_4 = 0x34;
-const XMLCh chDigit_5 = 0x35;
-const XMLCh chDigit_6 = 0x36;
-const XMLCh chDigit_7 = 0x37;
-const XMLCh chDigit_8 = 0x38;
-const XMLCh chDigit_9 = 0x39;
-
-const XMLCh chLatin_A = 0x41;
-const XMLCh chLatin_B = 0x42;
-const XMLCh chLatin_C = 0x43;
-const XMLCh chLatin_D = 0x44;
-const XMLCh chLatin_E = 0x45;
-const XMLCh chLatin_F = 0x46;
-const XMLCh chLatin_G = 0x47;
-const XMLCh chLatin_H = 0x48;
-const XMLCh chLatin_I = 0x49;
-const XMLCh chLatin_J = 0x4A;
-const XMLCh chLatin_K = 0x4B;
-const XMLCh chLatin_L = 0x4C;
-const XMLCh chLatin_M = 0x4D;
-const XMLCh chLatin_N = 0x4E;
-const XMLCh chLatin_O = 0x4F;
-const XMLCh chLatin_P = 0x50;
-const XMLCh chLatin_Q = 0x51;
-const XMLCh chLatin_R = 0x52;
-const XMLCh chLatin_S = 0x53;
-const XMLCh chLatin_T = 0x54;
-const XMLCh chLatin_U = 0x55;
-const XMLCh chLatin_V = 0x56;
-const XMLCh chLatin_W = 0x57;
-const XMLCh chLatin_X = 0x58;
-const XMLCh chLatin_Y = 0x59;
-const XMLCh chLatin_Z = 0x5A;
-
-const XMLCh chLatin_a = 0x61;
-const XMLCh chLatin_b = 0x62;
-const XMLCh chLatin_c = 0x63;
-const XMLCh chLatin_d = 0x64;
-const XMLCh chLatin_e = 0x65;
-const XMLCh chLatin_f = 0x66;
-const XMLCh chLatin_g = 0x67;
-const XMLCh chLatin_h = 0x68;
-const XMLCh chLatin_i = 0x69;
-const XMLCh chLatin_j = 0x6A;
-const XMLCh chLatin_k = 0x6B;
-const XMLCh chLatin_l = 0x6C;
-const XMLCh chLatin_m = 0x6D;
-const XMLCh chLatin_n = 0x6E;
-const XMLCh chLatin_o = 0x6F;
-const XMLCh chLatin_p = 0x70;
-const XMLCh chLatin_q = 0x71;
-const XMLCh chLatin_r = 0x72;
-const XMLCh chLatin_s = 0x73;
-const XMLCh chLatin_t = 0x74;
-const XMLCh chLatin_u = 0x75;
-const XMLCh chLatin_v = 0x76;
-const XMLCh chLatin_w = 0x77;
-const XMLCh chLatin_x = 0x78;
-const XMLCh chLatin_y = 0x79;
-const XMLCh chLatin_z = 0x7A;
-
-const XMLCh chYenSign = 0xA5;
-const XMLCh chWonSign = 0x20A9;
-
class XMLUTIL_EXPORT XMLUni
{
diff --git a/src/util/XMLUniDefs.hpp b/src/util/XMLUniDefs.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..17deeb9f2ce71e4f634a51a94c909d3003071b91
--- /dev/null
+++ b/src/util/XMLUniDefs.hpp
@@ -0,0 +1,182 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache\@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Id$
+ */
+#if !defined(XMLUNIDEFS_HPP)
+#define XMLUNIDEFS_HPP
+
+#include <util/XercesDefs.hpp>
+
+// ---------------------------------------------------------------------------
+// Constants for the Unicode characters of interest to us in an XML parser
+// We don't put these inside the class because then they could not be const
+// inline values, which would have significant performance ramifications.
+//
+// We cannot use a namespace because of the requirement to support old
+// compilers.
+// ---------------------------------------------------------------------------
+const XMLCh chNull = 0x00;
+const XMLCh chHTab = 0x09;
+const XMLCh chLF = 0x0A;
+const XMLCh chCR = 0x0D;
+const XMLCh chAmpersand = 0x26;
+const XMLCh chAsterisk = 0x2A;
+const XMLCh chAt = 0x40;
+const XMLCh chBackSlash = 0x5C;
+const XMLCh chBang = 0x21;
+const XMLCh chCloseAngle = 0x3E;
+const XMLCh chCloseCurly = 0x7D;
+const XMLCh chCloseParen = 0x29;
+const XMLCh chCloseSquare = 0x5D;
+const XMLCh chColon = 0x3A;
+const XMLCh chComma = 0x2C;
+const XMLCh chDash = 0x2D;
+const XMLCh chDollarSign = 0x24;
+const XMLCh chDoubleQuote = 0x22;
+const XMLCh chEqual = 0x3D;
+const XMLCh chForwardSlash = 0x2F;
+const XMLCh chGrave = 0x60;
+const XMLCh chOpenAngle = 0x3C;
+const XMLCh chOpenCurly = 0x7B;
+const XMLCh chOpenParen = 0x28;
+const XMLCh chOpenSquare = 0x5B;
+const XMLCh chPercent = 0x25;
+const XMLCh chPeriod = 0x2E;
+const XMLCh chPipe = 0x7C;
+const XMLCh chPlus = 0x2B;
+const XMLCh chPound = 0x23;
+const XMLCh chQuestion = 0x3F;
+const XMLCh chSingleQuote = 0x27;
+const XMLCh chSpace = 0x20;
+const XMLCh chSemiColon = 0x3B;
+const XMLCh chTilde = 0x7E;
+const XMLCh chUnderscore = 0x5F;
+
+const XMLCh chSwappedUnicodeMarker = XMLCh(0xFFFE);
+const XMLCh chUnicodeMarker = XMLCh(0xFEFF);
+
+const XMLCh chDigit_0 = 0x30;
+const XMLCh chDigit_1 = 0x31;
+const XMLCh chDigit_2 = 0x32;
+const XMLCh chDigit_3 = 0x33;
+const XMLCh chDigit_4 = 0x34;
+const XMLCh chDigit_5 = 0x35;
+const XMLCh chDigit_6 = 0x36;
+const XMLCh chDigit_7 = 0x37;
+const XMLCh chDigit_8 = 0x38;
+const XMLCh chDigit_9 = 0x39;
+
+const XMLCh chLatin_A = 0x41;
+const XMLCh chLatin_B = 0x42;
+const XMLCh chLatin_C = 0x43;
+const XMLCh chLatin_D = 0x44;
+const XMLCh chLatin_E = 0x45;
+const XMLCh chLatin_F = 0x46;
+const XMLCh chLatin_G = 0x47;
+const XMLCh chLatin_H = 0x48;
+const XMLCh chLatin_I = 0x49;
+const XMLCh chLatin_J = 0x4A;
+const XMLCh chLatin_K = 0x4B;
+const XMLCh chLatin_L = 0x4C;
+const XMLCh chLatin_M = 0x4D;
+const XMLCh chLatin_N = 0x4E;
+const XMLCh chLatin_O = 0x4F;
+const XMLCh chLatin_P = 0x50;
+const XMLCh chLatin_Q = 0x51;
+const XMLCh chLatin_R = 0x52;
+const XMLCh chLatin_S = 0x53;
+const XMLCh chLatin_T = 0x54;
+const XMLCh chLatin_U = 0x55;
+const XMLCh chLatin_V = 0x56;
+const XMLCh chLatin_W = 0x57;
+const XMLCh chLatin_X = 0x58;
+const XMLCh chLatin_Y = 0x59;
+const XMLCh chLatin_Z = 0x5A;
+
+const XMLCh chLatin_a = 0x61;
+const XMLCh chLatin_b = 0x62;
+const XMLCh chLatin_c = 0x63;
+const XMLCh chLatin_d = 0x64;
+const XMLCh chLatin_e = 0x65;
+const XMLCh chLatin_f = 0x66;
+const XMLCh chLatin_g = 0x67;
+const XMLCh chLatin_h = 0x68;
+const XMLCh chLatin_i = 0x69;
+const XMLCh chLatin_j = 0x6A;
+const XMLCh chLatin_k = 0x6B;
+const XMLCh chLatin_l = 0x6C;
+const XMLCh chLatin_m = 0x6D;
+const XMLCh chLatin_n = 0x6E;
+const XMLCh chLatin_o = 0x6F;
+const XMLCh chLatin_p = 0x70;
+const XMLCh chLatin_q = 0x71;
+const XMLCh chLatin_r = 0x72;
+const XMLCh chLatin_s = 0x73;
+const XMLCh chLatin_t = 0x74;
+const XMLCh chLatin_u = 0x75;
+const XMLCh chLatin_v = 0x76;
+const XMLCh chLatin_w = 0x77;
+const XMLCh chLatin_x = 0x78;
+const XMLCh chLatin_y = 0x79;
+const XMLCh chLatin_z = 0x7A;
+
+const XMLCh chYenSign = 0xA5;
+const XMLCh chWonSign = 0x20A9;
+
+
+#endif