diff --git a/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings b/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
index a14460114381e4cd621ab02186e2fc2fe8e3f927..f440c5732db9f834959d0fc99e1fb6e2d53a14e4 100644
--- a/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
+++ b/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Xerces";
-CFBundleShortVersionString = "XercesLib version 2.0.0";
-CFBundleGetInfoString = "XercesLib version 2.0.0";
+CFBundleShortVersionString = "XercesLib version 2.1.0";
+CFBundleGetInfoString = "XercesLib version 2.1.0";
 NSHumanReadableCopyright = "Copyright";
diff --git a/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj b/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
index 7374c55b50df33e18ede886044fed8c8a3ae2f59..d23ece2615cd5ec98456b94d8417bcac28fe8054 100644
--- a/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
+++ b/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
@@ -2793,7 +2793,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0</string>
+	<string>2.1.0</string>
 </dict>
 </plist>
 ";
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index e0e2f4603677be716de824a86bfd21e695cd68c3..a38dcf660afe8b2d6a25229cbee298b8c8f7b247 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -7,21 +7,21 @@
 CFG=XercesLib - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "XercesLib.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "XercesLib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -51,11 +51,11 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_0_0.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.0.0
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_1_0.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.1.0
 # SUBTRACT LINK32 /pdb:none /incremental:yes
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
@@ -79,11 +79,11 @@ LINK32=link.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_0_0D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.0.0
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_1_0D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.1.0
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
@@ -108,12 +108,12 @@ LINK32=link.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_0_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.0.0
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_1_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.1.0
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_0_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.0.0 /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_1_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.1.0 /machine:IA64
 # SUBTRACT LINK32  /pdb:none
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
@@ -137,15 +137,15 @@ LINK32=link.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_0_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.0.0
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib  /base:"0x12000000" /subsystem:windows /dll /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_1_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.1.0
 # SUBTRACT BASE LINK32 /pdb:none /incremental:yes
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_0_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.0.0 /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_1_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.1.0 /machine:IA64
 # SUBTRACT LINK32  /pdb:none
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
index facdee2954c272744cb34ce6f5c85ad325f6636d..14570f3c8726e15ebdb13e506c8dc8727f142e9a 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -2,30 +2,30 @@
 !IF "$(CFG)" == ""
 CFG=XercesLib - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to XercesLib - Win32 Debug.
-!ENDIF 
+!ENDIF
 
 !IF "$(CFG)" != "XercesLib - Win32 Release" && "$(CFG)" != "XercesLib - Win32 Debug" && "$(CFG)" != "XercesLib - Win64 Debug" && "$(CFG)" != "XercesLib - Win64 Release"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "XercesLib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
@@ -35,7 +35,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0.dll"
 
 
 CLEAN :
@@ -324,10 +324,10 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_2_0_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_2_1_0.map"
 	-@erase "$(OUTDIR)\xerces-c_2.exp"
 	-@erase "$(OUTDIR)\xerces-c_2.lib"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0.dll"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -336,48 +336,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_0_0.pdb" /map:"$(INTDIR)\xerces-c_2_0_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_0_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.0.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_1_0.pdb" /map:"$(INTDIR)\xerces-c_2_1_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_1_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.0.0
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -664,7 +664,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -677,7 +677,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0D.dll"
 
 
 CLEAN :
@@ -967,9 +967,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_2D.exp"
 	-@erase "$(OUTDIR)\xerces-c_2D.lib"
 
@@ -980,48 +980,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_0_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_0_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.0.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_1_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_1_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.0.0
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -1308,7 +1308,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -1321,7 +1321,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0D.dll"
 
 
 CLEAN :
@@ -1611,9 +1611,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_2D.exp"
 	-@erase "$(OUTDIR)\xerces-c_2D.lib"
 
@@ -1624,48 +1624,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_0_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_0_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.0.0 /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_1_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_1_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.0.0 /machine:IA64
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -1952,7 +1952,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -1965,7 +1965,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0.dll"
 
 
 CLEAN :
@@ -2254,11 +2254,11 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_2_0_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_2_1_0.map"
 	-@erase "$(OUTDIR)\xerces-c_2.exp"
 	-@erase "$(OUTDIR)\xerces-c_2.lib"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0.ilk"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -2267,48 +2267,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_0_0.pdb" /map:"$(INTDIR)\xerces-c_2_0_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_0_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.0.0 /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_1_0.pdb" /map:"$(INTDIR)\xerces-c_2_1_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_1_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.0.0 /machine:IA64
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -2595,21 +2595,21 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-!ENDIF 
+!ENDIF
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("XercesLib.dep")
 !INCLUDE "XercesLib.dep"
-!ELSE 
+!ELSE
 !MESSAGE Warning: cannot find "XercesLib.dep"
-!ENDIF 
-!ENDIF 
+!ENDIF
+!ENDIF
 
 
 !IF "$(CFG)" == "XercesLib - Win32 Release" || "$(CFG)" == "XercesLib - Win32 Debug" || "$(CFG)" == "XercesLib - Win64 Debug" || "$(CFG)" == "XercesLib - Win64 Release"
@@ -2617,7 +2617,7 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32PlatformUtils.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
-CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2627,7 +2627,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
 
-CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2637,7 +2637,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2647,7 +2647,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2655,13 +2655,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDE
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
-CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2671,7 +2671,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
 
-CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2681,7 +2681,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2691,7 +2691,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2699,13 +2699,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDE
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\Transcoders\Win32\Win32TransService.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
-CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2715,7 +2715,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
 
-CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2725,7 +2725,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2735,7 +2735,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2743,13 +2743,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDE
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\BinHTTPURLInputStream.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
-CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2759,7 +2759,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
 
-CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2769,7 +2769,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2779,7 +2779,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2787,13 +2787,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDE
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\WinSockNetAccessor.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win32 Release"
 
-CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2803,7 +2803,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win32 Debug"
 
-CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2813,7 +2813,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2823,7 +2823,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -2831,7 +2831,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDE
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\regx\ASCIIRangeFactory.cpp
 
@@ -4531,8 +4531,8 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.rc
 	$(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Testing\src\xercesc\util\Platforms\Win32" /d "NDEBUG" $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 
-!ENDIF 
+!ENDIF
 
diff --git a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
index 906fc380025ba7033cc49880eb1d4d0dc5ef621f..23f62db6cea144c7cff3652489be730943ee4c8d 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
+++ b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
@@ -47,8 +47,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib  /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\xml4com\Debug/xerces-com.dll" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
@@ -60,8 +60,8 @@ InputPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces-com.dll
 SOURCE="$(InputPath)"
 
 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_0_0D.dll "$(TargetDir)"
-	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_0_0D.dll "$(TargetDir)"
+	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
+	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
 	regsvr32 /s /c "$(TargetPath)"
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
 	
@@ -86,8 +86,8 @@ SOURCE="$(InputPath)"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
-# ADD BASE BSC32 
-# ADD BSC32 
+# ADD BASE BSC32
+# ADD BSC32
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /subsystem:windows /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib  /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency/xerces-com.dll" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
@@ -99,13 +99,13 @@ InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.d
 SOURCE="$(InputPath)"
 
 BuildCmds= \
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_0_0.dll $(TargetDir) \
-	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_0_0.dll $(TargetDir) \
+	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_1_0.dll $(TargetDir) \
+	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_1_0.dll $(TargetDir) \
 	regsvr32 /s /c "$(TargetPath)" \
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
 	
 
-"$(TargetDir)\xerces-c_2_0_0.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(TargetDir)\xerces-c_2_1_0.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
 
 "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
index 73b96253a740e0c0c477005af590eba433e8d03c..df53c2c3005943d9f60145285d04a32913651723 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
+++ b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.mak
@@ -2,28 +2,28 @@
 !IF "$(CFG)" == ""
 CFG=xml4com - Win32 Debug
 !MESSAGE No configuration specified. Defaulting to xml4com - Win32 Debug.
-!ENDIF 
+!ENDIF
 
 !IF "$(CFG)" != "xml4com - Win32 Debug" && "$(CFG)" != "xml4com - Win32 Release MinDependency"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "xerces-com.mak" CFG="xml4com - Win32 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "xml4com - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "xml4com - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
@@ -33,21 +33,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\Debug
 OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0" 
+!IF "$(RECURSE)" == "0"
 
 ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
 
-!ELSE 
+!ELSE
 
 ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
 
-!ENDIF 
+!ENDIF
 
-!IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win32 DebugCLEAN" 
-!ELSE 
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win32 DebugCLEAN"
+!ELSE
 CLEAN :
-!ENDIF 
+!ENDIF
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -83,48 +83,48 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
 MTL_PROJ=
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -160,13 +160,13 @@ InputPath=\Xerces-Testing\Build\Win32\xml4com\Debug\xerces-com.dll
 SOURCE="$(InputPath)"
 
 "$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_0_0D.dll "$(TargetDir)" 
-	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_0_0D.dll "$(TargetDir)" 
-	regsvr32 /s /c "$(TargetPath)" 
+	<<tempfile.bat
+	@echo off
+	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
+	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
+	regsvr32 /s /c "$(TargetPath)"
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<< 
+<<
 	
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
@@ -177,21 +177,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
 OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0" 
+!IF "$(RECURSE)" == "0"
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
-!ELSE 
+!ELSE
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
-!ENDIF 
+!ENDIF
 
-!IF "$(RECURSE)" == "1" 
+!IF "$(RECURSE)" == "1"
 CLEAN :
-!ELSE 
+!ELSE
 CLEAN :
-!ENDIF 
+!ENDIF
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -219,54 +219,54 @@ CLEAN :
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 	-@erase ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg"
-	-@erase "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+	-@erase "\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
 MTL_PROJ=
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG"
 BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release" 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:I386 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -300,26 +300,26 @@ TargetPath=\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.d
 InputPath=\Xerces-Testing\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
 SOURCE="$(InputPath)"
 
-"$(OUTDIR)\xerces-c_2_0_0.dll"	"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_0_0.dll $(TargetDir) 
-	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_0_0.dll $(TargetDir) 
-	regsvr32 /s /c "$(TargetPath)" 
+"$(OUTDIR)\xerces-c_2_1_0.dll"	"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat
+	@echo off
+	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_1_0.dll $(TargetDir)
+	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_1_0.dll $(TargetDir)
+	regsvr32 /s /c "$(TargetPath)"
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<< 
+<<
 	
 
-!ENDIF 
+!ENDIF
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("xerces-com.dep")
 !INCLUDE "xerces-com.dep"
-!ELSE 
+!ELSE
 !MESSAGE Warning: cannot find "xerces-com.dep"
-!ENDIF 
-!ENDIF 
+!ENDIF
+!ENDIF
 
 
 !IF "$(CFG)" == "xml4com - Win32 Debug" || "$(CFG)" == "xml4com - Win32 Release MinDependency"
@@ -333,7 +333,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\StdAfx.cpp
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -343,7 +343,7 @@ CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -351,7 +351,7 @@ CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xerc
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.cpp
 
@@ -363,7 +363,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.idl
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c" 
+MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 
 "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
 	$(MTL) @<<
@@ -373,7 +373,7 @@ MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win3
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c" 
+MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 
 "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
 	$(MTL) @<<
@@ -381,7 +381,7 @@ MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win3
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.rc
 
@@ -399,7 +399,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.rc
 	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces-Testing\src\xercesc\com" /d "NDEBUG" $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMAttribute.cpp
 
@@ -487,20 +487,20 @@ SOURCE=..\..\..\..\..\src\xercesc\com\XMLHTTPRequest.cpp
 
 !IF  "$(CFG)" == "xml4com - Win32 Debug"
 
-"XercesLib - Win32 Debug" : 
+"XercesLib - Win32 Debug" :
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" 
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug"
    cd "..\xerces-com"
 
-"XercesLib - Win32 DebugCLEAN" : 
+"XercesLib - Win32 DebugCLEAN" :
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN 
+   $(MAKE) CPP=$(CPP)  /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win32 Debug" RECURSE=1 CLEAN
    cd "..\xerces-com"
 
 !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
 
-!ENDIF 
+!ENDIF
 
 
-!ENDIF 
+!ENDIF
 
diff --git a/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
index bd9b54e02b27864527a3891a3527f75cd6f5a5bd..b4c1647b1485a4aa33f216bd98c3339b4bbfc2e0 100644
--- a/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
@@ -41,12 +41,12 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_0_0.dll"
+				OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_1_0.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_0_0.pdb"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_1_0.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_0_0.map"
+				MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_1_0.map"
 				SubSystem="2"
 				BaseAddress="0x12000000"
 				ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2.lib"/>
@@ -103,11 +103,11 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib"
-				OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_0_0D.dll"
+				OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_1_0D.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_0_0D.pdb"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_1_0D.pdb"
 				SubSystem="2"
 				BaseAddress="0x12000000"
 				ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2D.lib"/>
diff --git a/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj b/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
index bc83f666837bb77f2ee5c4e47f73a9d84ef25106..1df5ef99f13ec498a012946ff1c040ed2863e989 100644
--- a/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
+++ b/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
@@ -44,7 +44,7 @@
 				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
 echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
 "
-				Outputs="$(TargetDir)xerces-c_2_0_0.dll;$(OutDir)\regsvr32.trg"/>
+				Outputs="$(TargetDir)xerces-c_2_1_0.dll;$(OutDir)\regsvr32.trg"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
diff --git a/Projects/Win64/Nmake/xerces-all/XercesLib/XercesLib.mak b/Projects/Win64/Nmake/xerces-all/XercesLib/XercesLib.mak
index c3fef17177d613935ae17fb929d9c321c7fe3da8..aacf17b7d3ac1b43723e43b963d0e5294cc95c8d 100644
--- a/Projects/Win64/Nmake/xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win64/Nmake/xerces-all/XercesLib/XercesLib.mak
@@ -2,28 +2,28 @@
 !IF "$(CFG)" == ""
 CFG=XercesLib - Win64 Debug
 !MESSAGE No configuration specified. Defaulting to XercesLib - Win64 Debug.
-!ENDIF 
+!ENDIF
 
 !IF "$(CFG)" != "XercesLib - Win64 Release" && "$(CFG)" != "XercesLib - Win64 Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win64 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "XercesLib - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XercesLib - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
@@ -33,7 +33,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\Nmake\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\Nmake\Release
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0.dll"
 
 
 CLEAN :
@@ -322,10 +322,10 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_2_0_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_2_1_0.map"
 	-@erase "$(OUTDIR)\xerces-c_2.exp"
 	-@erase "$(OUTDIR)\xerces-c_2.lib"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0.dll"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -334,48 +334,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG"
 #BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_0_0.pdb" /map:"$(INTDIR)\xerces-c_2_0_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_0_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /machine:IA64 /version:2.0.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_1_0.pdb" /map:"$(INTDIR)\xerces-c_2_1_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_1_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /machine:IA64 /version:2.1.0
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -662,7 +662,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -675,7 +675,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\Nmake\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\Nmake\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_0_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_1_0D.dll"
 
 
 CLEAN :
@@ -965,9 +965,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_2_0_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_1_0D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_2D.exp"
 	-@erase "$(OUTDIR)\xerces-c_2D.lib"
 
@@ -978,48 +978,48 @@ CLEAN :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
-MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 
+MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG"
 #BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_0_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_0_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /machine:IA64 /version:2.0.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_1_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_1_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /machine:IA64 /version:2.1.0
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -1306,21 +1306,21 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMRangeException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_0_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_1_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-!ENDIF 
+!ENDIF
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("XercesLib.dep")
 !INCLUDE "XercesLib.dep"
-!ELSE 
+!ELSE
 !MESSAGE Warning: cannot find "XercesLib.dep"
-!ENDIF 
-!ENDIF 
+!ENDIF
+!ENDIF
 
 
 !IF "$(CFG)" == "XercesLib - Win64 Release" || "$(CFG)" == "XercesLib - Win64 Debug"
@@ -1328,7 +1328,7 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32PlatformUtils.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1338,7 +1338,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PL
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1346,13 +1346,13 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MA
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1362,7 +1362,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PL
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1370,13 +1370,13 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MA
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\Transcoders\Win32\Win32TransService.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1386,7 +1386,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PL
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1394,13 +1394,13 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MA
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\BinHTTPURLInputStream.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1410,7 +1410,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PL
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1418,13 +1418,13 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MA
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\WinSockNetAccessor.cpp
 
 !IF  "$(CFG)" == "XercesLib - Win64 Release"
 
-CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1434,7 +1434,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PL
 
 !ELSEIF  "$(CFG)" == "XercesLib - Win64 Debug"
 
-CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1442,7 +1442,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MA
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\util\regx\ASCIIRangeFactory.cpp
 
@@ -3126,8 +3126,8 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.rc
 	$(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Working\src\xercesc\util\Platforms\Win32" /d "_DEBUG" $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 
-!ENDIF 
+!ENDIF
 
diff --git a/Projects/Win64/Nmake/xerces-all/xerces-com/xerces-com.mak b/Projects/Win64/Nmake/xerces-all/xerces-com/xerces-com.mak
index c479275682866cb143e6e5bddc801937a4295bc1..5683713b05e660d016a55bb23a7f0c99336806d9 100644
--- a/Projects/Win64/Nmake/xerces-all/xerces-com/xerces-com.mak
+++ b/Projects/Win64/Nmake/xerces-all/xerces-com/xerces-com.mak
@@ -2,28 +2,28 @@
 !IF "$(CFG)" == ""
 CFG=xml4com - Win64 Debug
 !MESSAGE No configuration specified. Defaulting to xml4com - Win64 Debug.
-!ENDIF 
+!ENDIF
 
 !IF "$(CFG)" != "xml4com - Win64 Debug" && "$(CFG)" != "xml4com - Win64 Release MinDependency"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "xerces-com.mak" CFG="xml4com - Win64 Debug"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "xml4com - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "xml4com - Win64 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
+!MESSAGE
 !ERROR An invalid configuration is specified.
-!ENDIF 
+!ENDIF
 
 !IF "$(OS)" == "Windows_NT"
 NULL=
-!ELSE 
+!ELSE
 NULL=nul
-!ENDIF 
+!ENDIF
 
 !IF  "$(CFG)" == "xml4com - Win64 Debug"
 
@@ -33,21 +33,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\Debug
 OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0" 
+!IF "$(RECURSE)" == "0"
 
 ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
 
-!ELSE 
+!ELSE
 
 ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\Debug\regsvr32.trg"
 
-!ENDIF 
+!ENDIF
 
-!IF "$(RECURSE)" == "1" 
-CLEAN :"XercesLib - Win64 DebugCLEAN" 
-!ELSE 
+!IF "$(RECURSE)" == "1"
+CLEAN :"XercesLib - Win64 DebugCLEAN"
+!ELSE
 CLEAN :
-!ENDIF 
+!ENDIF
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -83,48 +83,48 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
 MTL_PROJ=
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "_DEBUG"
 #BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:IX86 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\Nmake\Debug" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-com.pdb" /debug /machine:IX86 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\Nmake\Debug" /machine:IA64
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -160,13 +160,13 @@ InputPath=\Xerces-Working\Build\Win32\xml4com\Debug\xerces-com.dll
 SOURCE="$(InputPath)"
 
 "$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	echo copy ..\..\..\..\..\Build\Win64\Nmake\Debug\xerces-c_2_0_0D.dll "$(TargetDir)" 
-	copy ..\..\..\..\..\Build\Win64\Nmake\Debug\xerces-c_2_0_0D.dll "$(TargetDir)" 
-	regsvr32 /s /c "$(TargetPath)" 
+	<<tempfile.bat
+	@echo off
+	echo copy ..\..\..\..\..\Build\Win64\Nmake\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
+	copy ..\..\..\..\..\Build\Win64\Nmake\Debug\xerces-c_2_1_0D.dll "$(TargetDir)"
+	regsvr32 /s /c "$(TargetPath)"
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<< 
+<<
 	
 
 !ELSEIF  "$(CFG)" == "xml4com - Win64 Release MinDependency"
@@ -177,21 +177,21 @@ INTDIR=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
 OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
 # End Custom Macros
 
-!IF "$(RECURSE)" == "0" 
+!IF "$(RECURSE)" == "0"
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
-!ELSE 
+!ELSE
 
-ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+ALL : "$(OUTDIR)\xerces-com.dll" "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" "..\..\..\..\..\src\xercesc\com\xml4com.h" "..\..\..\..\..\src\xercesc\com\xml4com_i.c" ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg" "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
-!ENDIF 
+!ENDIF
 
-!IF "$(RECURSE)" == "1" 
+!IF "$(RECURSE)" == "1"
 CLEAN :
-!ELSE 
+!ELSE
 CLEAN :
-!ENDIF 
+!ENDIF
 	-@erase "$(INTDIR)\BindStatusCallback.obj"
 	-@erase "$(INTDIR)\StdAfx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
@@ -219,54 +219,54 @@ CLEAN :
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com.h"
 	-@erase "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 	-@erase ".\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\regsvr32.trg"
-	-@erase "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_0_0.dll"
+	-@erase "\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-c_2_1_0.dll"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=$(CPP)
-CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.obj::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .c{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cpp{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 .cxx{$(INTDIR)}.sbr::
    $(CPP) @<<
-   $(CPP_PROJ) $< 
+   $(CPP_PROJ) $<
 <<
 
 MTL=midl.exe
 MTL_PROJ=
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG" 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\xml4com.res" /d "NDEBUG"
 #BSC32=bscmake.exe
-BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc" 
+BSC32_FLAGS=/o"$(OUTDIR)\xerces-com.bsc"
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:IX86 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win64\Nmake\Release" /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-com.pdb" /machine:IX86 /def:"..\..\..\..\..\src\xercesc\com\xml4com.def" /out:"$(OUTDIR)\xerces-com.dll" /implib:"$(OUTDIR)\xerces-com.lib" /libpath:"..\..\..\..\..\Build\Win64\Nmake\Release" /machine:IA64
 DEF_FILE= \
 	"..\..\..\..\..\src\xercesc\com\xml4com.def"
 LINK32_OBJS= \
@@ -300,26 +300,26 @@ TargetPath=\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.d
 InputPath=\Xerces-Working\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
 SOURCE="$(InputPath)"
 
-"$(OUTDIR)\xerces-c_2_0_0.dll"	"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	echo copy ..\..\..\..\..\Build\Win64\Nmake\Release\xerces-c_2_0_0.dll $(TargetDir) 
-	copy ..\..\..\..\..\Build\Win64\Nmake\Release\xerces-c_2_0_0.dll $(TargetDir) 
-	regsvr32 /s /c "$(TargetPath)" 
+"$(OUTDIR)\xerces-c_2_1_0.dll"	"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	<<tempfile.bat
+	@echo off
+	echo copy ..\..\..\..\..\Build\Win64\Nmake\Release\xerces-c_2_1_0.dll $(TargetDir)
+	copy ..\..\..\..\..\Build\Win64\Nmake\Release\xerces-c_2_1_0.dll $(TargetDir)
+	regsvr32 /s /c "$(TargetPath)"
 	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-<< 
+<<
 	
 
-!ENDIF 
+!ENDIF
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("xerces-com.dep")
 !INCLUDE "xerces-com.dep"
-!ELSE 
+!ELSE
 !MESSAGE Warning: cannot find "xerces-com.dep"
-!ENDIF 
-!ENDIF 
+!ENDIF
+!ENDIF
 
 
 !IF "$(CFG)" == "xml4com - Win64 Debug" || "$(CFG)" == "xml4com - Win64 Release MinDependency"
@@ -333,7 +333,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\StdAfx.cpp
 
 !IF  "$(CFG)" == "xml4com - Win64 Debug"
 
-CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -343,7 +343,7 @@ CPP_SWITCHES=/MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..
 
 !ELSEIF  "$(CFG)" == "xml4com - Win64 Release MinDependency"
 
-CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Fp"$(INTDIR)\xerces-com.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
 
 "$(INTDIR)\StdAfx.obj"	"$(INTDIR)\xerces-com.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -351,7 +351,7 @@ CPP_SWITCHES=/MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xerc
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.cpp
 
@@ -363,7 +363,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.idl
 
 !IF  "$(CFG)" == "xml4com - Win64 Debug"
 
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c" 
+MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 
 "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
 	$(MTL) @<<
@@ -373,7 +373,7 @@ MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win3
 
 !ELSEIF  "$(CFG)" == "xml4com - Win64 Release MinDependency"
 
-MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c" 
+MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb" /h "..\..\..\..\..\src\xercesc\com\xml4com.h" /iid "..\..\..\..\..\src\xercesc\com\xml4com_i.c"
 
 "..\..\..\..\..\Build\Win32\xml4com\xml4com.tlb"	"..\..\..\..\..\src\xercesc\com\xml4com.h"	"..\..\..\..\..\src\xercesc\com\xml4com_i.c" : $(SOURCE) "$(INTDIR)"
 	$(MTL) @<<
@@ -381,7 +381,7 @@ MTL_SWITCHES=/I "..\..\..\..\..\src\xercesc\com" /tlb "..\..\..\..\..\Build\Win3
 <<
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.rc
 
@@ -399,7 +399,7 @@ SOURCE=..\..\..\..\..\src\xercesc\com\xml4com.rc
 	$(RSC) /l 0x409 /fo"$(INTDIR)\xml4com.res" /i "\Xerces-Working\src\xercesc\com" /d "NDEBUG" $(SOURCE)
 
 
-!ENDIF 
+!ENDIF
 
 SOURCE=..\..\..\..\..\src\xercesc\com\XMLDOMAttribute.cpp
 
@@ -487,20 +487,20 @@ SOURCE=..\..\..\..\..\src\xercesc\com\XMLHTTPRequest.cpp
 
 !IF  "$(CFG)" == "xml4com - Win64 Debug"
 
-"XercesLib - Win64 Debug" : 
+"XercesLib - Win64 Debug" :
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" 
+   $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug"
    cd "..\xerces-com"
 
-"XercesLib - Win64 DebugCLEAN" : 
+"XercesLib - Win64 DebugCLEAN" :
    cd "..\XercesLib"
-   $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN 
+   $(MAKE) CPP=$(CPP) /$(MAKEFLAGS) /F ".\XercesLib.mak" CFG="XercesLib - Win64 Debug" RECURSE=1 CLEAN
    cd "..\xerces-com"
 
 !ELSEIF  "$(CFG)" == "xml4com - Win64 Release MinDependency"
 
-!ENDIF 
+!ENDIF
 
 
-!ENDIF 
+!ENDIF
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 1ae7fedff9433b6ea764f594f739a73c1f690395..a94acefca342f545eb683a113312bd26660e20a2 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -25,7 +25,7 @@ PROJECT_NAME         = Xerces-C++
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER       = v2.0.0
+PROJECT_NUMBER       = v2.1.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/migration.xml b/doc/migration.xml
index 52145985d94407e74eb1246f0c78b35157f15cb6..b2cb15009a663db5e3a3ed03896be09c2fbb7866 100644
--- a/doc/migration.xml
+++ b/doc/migration.xml
@@ -4,324 +4,59 @@
 <s1 title="Migration">
     <s2 title="Migration Archive">
 
-       <p>For migration information to &XercesCName; 1.7.0 or earlier,
+       <p>For migration information to &XercesCName; 2.0.0 or earlier,
           please refer to <jump href="migrate_archive.html">Migration Archive. </jump></p>
 
     </s2>
 
-    <s2 title="Migrating from &XercesCName; 1.7.0 to &XercesCName; &XercesCVersion;">
+    <s2 title="Migrating from &XercesCName; 2.0.0 to &XercesCName; &XercesCVersion;">
       <p>This document is a discussion of the technical differences between
-      &XercesCName; 1.7.0 code base and the &XercesCName; &XercesCVersion;.</p>
+      &XercesCName; 2.0.0 code base and the &XercesCName; &XercesCVersion;.</p>
 
       <p>Topics discussed are:</p>
       <ul>
-        <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion;</link></li>
-        <li><link anchor="LibraryChange">Unix Library Name change</link></li>
-        <li><link anchor="DirChange">DOM Reorganization</link></li>
-        <li><link anchor="Reuse">Reuse Grammar becomes Grammar Caching</link></li>
-        <li><link anchor="API">Public API Changes</link></li>
+        <li><link anchor="NewFeatures210">New features in &XercesCName; &XercesCVersion;</link></li>
+        <li><link anchor="API210">Public API Changes</link></li>
         <ul>
-            <li><link anchor="NewAPI">New Public API</link></li>
-            <li><link anchor="ModifiedAPI">Modified Public API</link></li>
-            <li><link anchor="DeprecatedAPI">Deprecated/Removed Public API</link></li>
+            <li><link anchor="NewAPI210">New Public API</link></li>
+            <li><link anchor="ModifiedAPI210">Modified Public API</link></li>
+            <li><link anchor="DeprecatedAPI210">Deprecated/Removed Public API</link></li>
         </ul>
       </ul>
 
-    <anchor name="NewFeatures"/>
+    <anchor name="NewFeatures210"/>
     <s3 title="New features in &XercesCName; &XercesCVersion;">
       <ul>
         <li>64 bit binaries distribution</li>
-        <li>Follow Unix Shared Library Naming Convention</li>
-        <li>Apache Recommended DOM C++ Binding</li>
-        <li>Experimental DOM Level 3 subset support, including DOMWriter and DOMBuilder</li>
-        <li>Grammar preparsing and Grammar caching</li>
-        <li>Optionally ignore loading of external DTD</li>
-        <li>Project files for Microsoft Visual C++ .Net</li>
-        <li>Codewarrior 8 support</li>
-        <li>Option to enable/disable strict IANA encoding name checking</li>
         <li>plus many more bug fixes and performance enhancement</li>
       </ul>
     </s3>
 
-    <anchor name="LibraryChange"/>
-    <s3 title="Unix Library Name Change">
-      <p>The &XercesCName; UNIX Library now follows the Unix Shared Library Naming Convention (libname.so.soname).
-         It is now called:</p>
-         <ul>
-            <li>AIX</li>
-            <ul>
-              <li>&XercesCUnixLib;&XercesCUnixSoName;.so</li>
-              <li>symbolic link: &XercesCUnixLib;.so                      ----&gt; &XercesCUnixLib;&XercesCUnixVersion;.so</li>
-              <li>symbolic link: &XercesCUnixLib;&XercesCUnixVersion;.so  ----&gt; &XercesCUnixLib;&XercesCUnixSoName;.so</li>
-            </ul>
-            <li>Solaris / Linux</li>
-            <ul>
-              <li>&XercesCUnixLib;.so.&XercesCUnixSoName;</li>
-              <li>symbolic link: &XercesCUnixLib;.so                      ----&gt; &XercesCUnixLib;.so.&XercesCUnixVersion;</li>
-              <li>symbolic link: &XercesCUnixLib;.so.&XercesCUnixVersion; ----&gt; &XercesCUnixLib;.so.&XercesCUnixSoName;</li>
-            </ul>
-            <li>HP-UX</li>
-            <ul>
-              <li>&XercesCUnixLib;.sl.&XercesCUnixSoName;</li>
-              <li>symbolic link: &XercesCUnixLib;.sl                      ----&gt; &XercesCUnixLib;.sl.&XercesCUnixVersion;</li>
-              <li>symbolic link: &XercesCUnixLib;.sl.&XercesCUnixVersion; ----&gt; &XercesCUnixLib;.sl.&XercesCUnixSoName;</li>
-            </ul>
-         </ul>
-    </s3>
-
-    <anchor name="DirChange"/>
-    <s3 title="DOM Reorganization">
-        <p>1. The old Java-like DOM is now deprecated, and all the associated files, including the headers
-              and DOMParser files are moved to <code>src/xercesc/dom/deprecated</code>.  Users of the old
-              Java-like DOM are required to change all their #include lines to pick up the headers.
-              For example</p>
-<source>
-//old code
-#include &lt;xercesc/dom/DOM.hpp&gt;
-#include &lt;xercesc/dom/DOM_Document.hpp&gt;
-#include &lt;xercesc/parsers/DOMParser.hpp&gt;
-
-void test(char* xmlFile) {
-    DOMParser parser;
-    parser.parse(xmlFile);
-    DOM_Document doc = parser.getDocument();
-    :
-    return;
-}
-</source>
-              <p> should now change to </p>
-<source>
-//new code
-#include &lt;xercesc/dom/deprecated/DOM.hpp&gt;          //&lt;==== change this include line
-#include &lt;xercesc/dom/deprecated/DOM_Document.hpp&gt; //&lt;==== change this include line
-#include &lt;xercesc/dom/deprecated/DOMParser.hpp&gt;    //&lt;==== change this include line
-
-// the rest is the same
-void test(char* xmlFile) {
-    DOMParser parser;
-    parser.parse(xmlFile);
-    DOM_Document doc = parser.getDocument();
-    :
-    return;
-}
-</source>
-        <p>2. The Experimental IDOM is now renamed, and becomes the Apache Recommended DOM C++ Binding.
-              The following changes are made: </p>
-              <ul>
-                 <li>class names are renamed from IDOM_XXXX to DOMXXXX, e.g. IDOM_Document to DOMDocument</li>
-                 <li>and thus header files are renamed from IDOM_XXXX.hpp to DOMXXXX.hpp and are moved
-                     to <code>src/xercesc/dom</code></li>
-                 <li>the IDOMParser is renamed to XercesDOMParser.  And thus the header
-                     file is renamed as well</li>
-                 <li>the rest is the same, see
-                     <jump href="ApacheDOMC++Binding.html">Apache Recommended DOM C++ binding</jump>
-                     and <jump href="program-dom.html">DOM Programming Guide</jump> for more programming
-                     information</li>
-              </ul>
-              <p>Users of IDOM are required to change all their #include lines and do a global rename of
-                 IDOMParser to XercesDOMParesr, and IDOM_XXXX to DOMXXXX.  For example</p>
-<source>
-//old code
-#include &lt;xercesc/idom/IDOM.hpp&gt;
-#include &lt;xercesc/idom/IDOM_Document.hpp&gt;
-#include &lt;xercesc/parsers/IDOMParser.hpp&gt;
-
-void test(char* xmlFile) {
-    IDOMParser parser;
-    parser.parse(xmlFile);
-    IDOM_Document* doc = parser.getDocument();
-    :
-    return;
-}
-</source>
-              <p> should now change to </p>
-<source>
-//new code
-#include &lt;xercesc/dom/DOM.hpp&gt;                  //&lt;==== change this include line
-#include &lt;xercesc/dom/DOMDocument.hpp&gt;          //&lt;==== change this include line
-#include &lt;xercesc/parsers/XercesDOMParser.hpp&gt;  //&lt;==== change this include line
-
-void test(char* xmlFile) {
-    XercesDOMParser parser;                           //&lt;==== rename the IDOMParser
-    parser.parse(xmlFile);
-    DOMDocument* doc = parser.getDocument();          //&lt;==== rename the IDOM_XXXX
-    :
-    return;
-}
-</source>
-    </s3>
-
-    <anchor name="Reuse"/>
-    <s3 title="Reuse Grammar becomes Grammar Caching">
-        <p>The &XercesCName; &XercesCVersion; extends the "Reuse Grammar" support by replacing it with
-           a new feature called "Grammar Caching" which provides more flexibility in reusing grammars.
-           Users who used to do the following:</p>
-<source>
-
-      XercesDOMParser parser;
-
-      // this is the first parse, just usual code as you do normal parse
-      // "firstXmlFile" has a grammar (schema or DTD) specified.
-      parser.parse(firstXmlFile);
-
-      // this is the second parse, by setting second parameter to true,
-      // the parser will reuse the grammar in the last parse
-      // (i.e. the one in  "firstXmlFile")
-      // to validate the second "anotherXmlFile".  Any grammar that is
-      // specified in anotherXmlFile is IGNORED.
-      //
-      // Note: The anotherXmlFile cannot have any DTD internal subset.
-      parser.parse(anotherXmlFile, true);
-
-</source>
-        <p>should now use the features cacheGrammarFromParse and useCachedGrammarFromParse:</p>
-<source>
-      XercesDOMParser parser;
-
-      // By setting cacheGrammarFromParse to true,
-      // the parser will cache any grammars encountered in the
-      // follow-on xml files, if not cached already
-      parser.cacheGrammarFromParse(true);
-
-      parser.parse(firstXmlFile);
-
-      // By setting useCachedGrammarFromParse to true,
-      // the parser will use all the previous cached grammars
-      // to validate the follow-on xml files if the cached
-      // grammar matches the one specified in anotherXmlFile.
-      //
-      // Note: The follow-on xml files cannot have any DTD internal subset.
-      parser.useCachedGrammarFromParse(true);
-
-      parser.parse(anotherXmlFile);
-
-      // This will flush the cached grammar pool
-      parser.resetCachedGrammarPool();
-</source>
-
-        <p>Note there are a number of differences between "Reuse Grammar" and "Grammar Caching" </p>
-           <ol>
-              <li>"Reuse Grammar" ignores any grammar that is specified in anotherXmlFile and simply
-                  reuse whatever stored in previous parse; while "Grammar Caching" will use the
-                  cached grammar only if it matches the one specified in the anotherXmlFile.
-                  If not match, then the new grammar is parsed.</li>
-              <li>"Reuse Grammar" can only reuse the grammar from previous parse; while "Grammar Caching"
-                  can selectively cache many grammars from different parses and collect them all in a pool indexed
-                  by targetNamespace (for Schema) or system id (for DTD).</li>
-              <li>Plus "Grammar Caching" has much more functionalities other than above
-                  (like "Pre-parsing Grammar").  Please refer to
-                  <jump href="program-others.html#GrammarCache">Preparsing Grammar and Grammar Caching
-                  </jump> for more programming details.</li>
-           </ol>
-    </s3>
-
-    <anchor name="API"/>
+    <anchor name="API210"/>
     <s3 title="Public API Changes">
 
         <p>The following lists the public API changes between the &XercesCName;
-           1.7.0; and the &XercesCName; &XercesCVersion; releases
+           2.0.0; and the &XercesCName; &XercesCVersion; releases
            of the parser. </p>
 
-        <anchor name="NewAPI"/>
+        <anchor name="NewAPI210"/>
         <s4 title="New Public API">
             <ul>
-              <li>To support DOM Level 3, the following are added (see
-                  <jump href="api.html">the API documentation page</jump> for details).</li>
-                <ul>
-                  <li>DOMNode functions set/getUserData, isSameNode isEqualNode.</li>
-                  <li>DOMDocument functions renameNode, get/setActualEncoding, get/setEncoding, get/setVersion, get/setStandalone, get/setDocumentURI.</li>
-                  <li>DOMEntity functions get/setActualEncoding, get/setEncoding, get/setVersion.</li>
-                  <li>classes AbstractDOMParser, DOMError, DOMErrorHandler, and DOMLocator.</li>
-                  <li>classes DOMUserDataHandler, DOMImplementationRegistry and DOMImplementationSource.</li>
-                  <li>classes DOMBuilder, DOMEntityResolver, DOMImplementationLS, DOMInputSource,
-                      Wrapper4DOMInputSource and Wrapper4InputSource.</li>
-                  <li>classes DOMWriter, DOMWriterFilter, LocalFileFormatTarget, StdOutFormatTarget,
-                      and MemBufFormatTarget</li>
-                </ul>
-              <li>To support DOMWriter, the following PlatformUtils functions are added</li>
-                <ul>
-                   <li>openFileToWrite, writeBufferToFile</li>
-                </ul>
-              <li>To have Apache Recommended DOM C++ Binding, the following are added (see
-                  <jump href="ApacheDOMC++Binding.html">Apache Recommended DOM C++ binding).</jump></li>
-                <ul>
-                  <li>function release() to fix Memory Management problem</li>
-                  <li>classes DOMDocumentRange and DOMDocumentTraversal</li>
-                  <li>XMLSize_t is used to represent unsigned integral type in DOM</li>
-                  <li>IDOM_XXXX classes are renamed to DOMXXXX, and IDOMParser is renamed to XercesDOMParser
-                      as described in <link anchor="DirChange">DOM Reorganization</link></li>
-                  <li>XercesDOMParser::adoptDocument is added so that document can optionally live
-                  outside the parser.</li>
-                </ul>
-              <li>To support optionally load external DTD, the following are added:</li>
-                <ul>
-                  <li>XercesDOMParser::set/getLoadExternalDTD</li>
-                  <li>DOMParser::set/getLoadExternalDTD</li>
-                  <li>SAXParser::set/getLoadExternalDTD</li>
-                  <li>and SAX2XMLReader will recognize the feature
-                      http://apache.org/xml/features/nonvalidating/load-external-dtd</li>
-                </ul>
-              <li>To support Preparsing Grammar and Grammar Caching, the following are added:</li>
-                <ul>
-                   <li>XercesDOMParser/DOMParser/SAXParser functions loadGrammar, resetCachedGrammarPool,
-                       cacheGrammarFromParse, isCachingGrammarFromParse, useCachedGrammarInParse,
-                       isUsingCachedGrammarInParse.</li>
-                   <li>SAX2XMLReader functions loadGrammar, resetCachedGrammarPool, and will recognize the features
-                       http://apache.org/xml/features/validation/cache-grammarFromParse and
-                       http://apache.org/xml/features/validation/use-cachedGrammarInParse.</li>
-                </ul>
-              <li>To support access to Grammar info, the following are added:</li>
-                <ul>
-                   <li>XercesDOMParser/DOMParser/SAXParser/SAX2XMLReader functions getRootGrammar, getGrammar, getURIText.</li>
-                </ul>
-              <li>To support strict IANA encoding name checking, the following are added:</li>
-                <ul>
-                   <li>class EncodingValidator.</li>
-                   <li>PlatformUtils functions strictIANAEncoding, isStrictIANAEncoding.</li>
-                   <li>XMLTransService functions strictIANAEncoding, isStrictIANAEncoding.</li>
-                </ul>
+              <li>No new public API is introduced in this release.</li>
             </ul>
         </s4>
 
-        <anchor name="ModifiedAPI"/>
+        <anchor name="ModifiedAPI210"/>
         <s4 title="Modified Public API">
             <ul>
-              <li>SAXParser::getScanner() is moved from public to protected.</li>
-              <li>Grammar::getGrammarType has been added a const modifier.</li>
-              <li>Xerces features are renamed from XMLUni::fgSAX2XercesXXXX to XMLUni::fgXercesXXXX
-                  so that they can be shared with DOM parser.</li>
-              <li>With the new Grammar Caching introduced, the the last parameter "reuseGrammar" in
-                  the following API is dropped.
-                   Users should now use the "Grammar Caching" feature as described in
-                   <link anchor="Reuse">Reuse Grammar becomes Grammar Caching</link>.</li>
-                <ul>
-                   <li>(in Parser, SAXParser, DOMParser, and XercesDOMParser) </li>
-                   <li>parse(const InputSource&amp; source, const bool reuseGrammar = false);</li>
-                   <li>parse(const XMLCh* const systemId, const bool reuseGrammar = false);</li>
-                   <li>parse(const char* const systemId, const bool reuseGrammar = false);</li>
-                   <li>(in SAXParser, DOMParser, and XercesDOMParser) </li>
-                   <li>parseFirst(const InputSource&amp; source, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
-                   <li>parseFirst(const XMLCh* const systemId, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
-                   <li>parseFirst(const char* const systemId, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
-                </ul>
+              <li>DOMNodeList::item, and DOMNodeList::getLength have been added a const modifier.</li>
             </ul>
         </s4>
 
-        <anchor name="DeprecatedAPI"/>
+        <anchor name="DeprecatedAPI210"/>
         <s4 title="Deprecated/Removed Public API">
             <ul>
-              <li>The old Java-like DOM is now deprecated as described in
-                  <link anchor="DirChange">DOM Reorganization</link></li>
-              <li>SAX2XMLReader::setValidationConstraint.   For consistency, SAX2XMLReader users should
-                  set the feature http://apache.org/xml/features/validation-error-as-fatal" instead.</li>
-              <li>SAX2XMLReader::setExitOnFirstFatalError.  For consistency, SAX2XMLReader users should
-                  set the feature "http://apache.org/xml/features/continue-after-fatal-error" instead.</li>
-              <li>With the new Grammar Caching introduced, the following features will not be
-                  recognized by the SAX2XMLReader:</li>
-                <ul>
-                   <li>http://apache.org/xml/features/validation/reuse-grammar</li>
-                   <li>http://apache.org/xml/features/validation/reuse-validator</li>
-                </ul>
+              <li>No Deprecated Public API in this release.</li>
             </ul>
         </s4>
 
diff --git a/doc/migration_archive.xml b/doc/migration_archive.xml
index 3782298cbe9d650c64a77e73244348121a24c9d5..531e46ae91fec8c5f87cedf2709657585110053d 100644
--- a/doc/migration_archive.xml
+++ b/doc/migration_archive.xml
@@ -4,6 +4,7 @@
 <s1 title="Migration Archive">
     <s2 title="Migrating to earlier Releases">
       <ul>
+        <li><link anchor="Migrateto200">Migrating from &XercesCName; 1.7.0 to 2.0.0</link></li>
         <li><link anchor="Migrateto170">Migrating from &XercesCName; 1.6.0 to 1.7.0</link></li>
         <li><link anchor="Migrateto160">Migrating from &XercesCName; 1.5.2 to 1.6.0</link></li>
         <li><link anchor="Migrateto152">Migrating from &XercesCName; 1.4.0 to 1.5.2</link></li>
@@ -11,6 +12,325 @@
       </ul>
     </s2>
 
+    <anchor name="Migrateto200"/>
+    <s2 title="Migrating from &XercesCName; 1.7.0 to &XercesCName; 2.0.0">
+      <p>This document is a discussion of the technical differences between
+      &XercesCName; 1.7.0 code base and the &XercesCName; 2.0.0.</p>
+
+      <p>Topics discussed are:</p>
+      <ul>
+        <li><link anchor="NewFeatures200">New features in &XercesCName; 2.0.0</link></li>
+        <li><link anchor="LibraryChange200">Unix Library Name change</link></li>
+        <li><link anchor="DirChange200">DOM Reorganization</link></li>
+        <li><link anchor="Reuse200">Reuse Grammar becomes Grammar Caching</link></li>
+        <li><link anchor="API200">Public API Changes</link></li>
+        <ul>
+            <li><link anchor="NewAPI200">New Public API</link></li>
+            <li><link anchor="ModifiedAPI200">Modified Public API</link></li>
+            <li><link anchor="DeprecatedAPI200">Deprecated/Removed Public API</link></li>
+        </ul>
+      </ul>
+
+    <anchor name="NewFeatures200"/>
+    <s3 title="New features in &XercesCName; 2.0.0">
+      <ul>
+        <li>64 bit binaries distribution</li>
+        <li>Follow Unix Shared Library Naming Convention</li>
+        <li>Apache Recommended DOM C++ Binding</li>
+        <li>Experimental DOM Level 3 subset support, including DOMWriter and DOMBuilder</li>
+        <li>Grammar preparsing and Grammar caching</li>
+        <li>Optionally ignore loading of external DTD</li>
+        <li>Project files for Microsoft Visual C++ .Net</li>
+        <li>Codewarrior 8 support</li>
+        <li>Option to enable/disable strict IANA encoding name checking</li>
+        <li>plus many more bug fixes and performance enhancement</li>
+      </ul>
+    </s3>
+
+    <anchor name="LibraryChange200"/>
+    <s3 title="Unix Library Name Change">
+      <p>The &XercesCName; UNIX Library now follows the Unix Shared Library Naming Convention (libname.so.soname).
+         It is now called:</p>
+         <ul>
+            <li>AIX</li>
+            <ul>
+              <li>&XercesCUnixLib;&XercesCUnixSoName;.so</li>
+              <li>symbolic link: &XercesCUnixLib;.so                      ----&gt; &XercesCUnixLib;&XercesCUnixVersion;.so</li>
+              <li>symbolic link: &XercesCUnixLib;&XercesCUnixVersion;.so  ----&gt; &XercesCUnixLib;&XercesCUnixSoName;.so</li>
+            </ul>
+            <li>Solaris / Linux</li>
+            <ul>
+              <li>&XercesCUnixLib;.so.&XercesCUnixSoName;</li>
+              <li>symbolic link: &XercesCUnixLib;.so                      ----&gt; &XercesCUnixLib;.so.&XercesCUnixVersion;</li>
+              <li>symbolic link: &XercesCUnixLib;.so.&XercesCUnixVersion; ----&gt; &XercesCUnixLib;.so.&XercesCUnixSoName;</li>
+            </ul>
+            <li>HP-UX</li>
+            <ul>
+              <li>&XercesCUnixLib;.sl.&XercesCUnixSoName;</li>
+              <li>symbolic link: &XercesCUnixLib;.sl                      ----&gt; &XercesCUnixLib;.sl.&XercesCUnixVersion;</li>
+              <li>symbolic link: &XercesCUnixLib;.sl.&XercesCUnixVersion; ----&gt; &XercesCUnixLib;.sl.&XercesCUnixSoName;</li>
+            </ul>
+         </ul>
+    </s3>
+
+    <anchor name="DirChange200"/>
+    <s3 title="DOM Reorganization">
+        <p>1. The old Java-like DOM is now deprecated, and all the associated files, including the headers
+              and DOMParser files are moved to <code>src/xercesc/dom/deprecated</code>.  Users of the old
+              Java-like DOM are required to change all their #include lines to pick up the headers.
+              For example</p>
+<source>
+//old code
+#include &lt;xercesc/dom/DOM.hpp&gt;
+#include &lt;xercesc/dom/DOM_Document.hpp&gt;
+#include &lt;xercesc/parsers/DOMParser.hpp&gt;
+
+void test(char* xmlFile) {
+    DOMParser parser;
+    parser.parse(xmlFile);
+    DOM_Document doc = parser.getDocument();
+    :
+    return;
+}
+</source>
+              <p> should now change to </p>
+<source>
+//new code
+#include &lt;xercesc/dom/deprecated/DOM.hpp&gt;          //&lt;==== change this include line
+#include &lt;xercesc/dom/deprecated/DOM_Document.hpp&gt; //&lt;==== change this include line
+#include &lt;xercesc/dom/deprecated/DOMParser.hpp&gt;    //&lt;==== change this include line
+
+// the rest is the same
+void test(char* xmlFile) {
+    DOMParser parser;
+    parser.parse(xmlFile);
+    DOM_Document doc = parser.getDocument();
+    :
+    return;
+}
+</source>
+        <p>2. The Experimental IDOM is now renamed, and becomes the Apache Recommended DOM C++ Binding.
+              The following changes are made: </p>
+              <ul>
+                 <li>class names are renamed from IDOM_XXXX to DOMXXXX, e.g. IDOM_Document to DOMDocument</li>
+                 <li>and thus header files are renamed from IDOM_XXXX.hpp to DOMXXXX.hpp and are moved
+                     to <code>src/xercesc/dom</code></li>
+                 <li>the IDOMParser is renamed to XercesDOMParser.  And thus the header
+                     file is renamed as well</li>
+                 <li>the rest is the same, see
+                     <jump href="ApacheDOMC++Binding.html">Apache Recommended DOM C++ binding</jump>
+                     and <jump href="program-dom.html">DOM Programming Guide</jump> for more programming
+                     information</li>
+              </ul>
+              <p>Users of IDOM are required to change all their #include lines and do a global rename of
+                 IDOMParser to XercesDOMParesr, and IDOM_XXXX to DOMXXXX.  For example</p>
+<source>
+//old code
+#include &lt;xercesc/idom/IDOM.hpp&gt;
+#include &lt;xercesc/idom/IDOM_Document.hpp&gt;
+#include &lt;xercesc/parsers/IDOMParser.hpp&gt;
+
+void test(char* xmlFile) {
+    IDOMParser parser;
+    parser.parse(xmlFile);
+    IDOM_Document* doc = parser.getDocument();
+    :
+    return;
+}
+</source>
+              <p> should now change to </p>
+<source>
+//new code
+#include &lt;xercesc/dom/DOM.hpp&gt;                  //&lt;==== change this include line
+#include &lt;xercesc/dom/DOMDocument.hpp&gt;          //&lt;==== change this include line
+#include &lt;xercesc/parsers/XercesDOMParser.hpp&gt;  //&lt;==== change this include line
+
+void test(char* xmlFile) {
+    XercesDOMParser parser;                           //&lt;==== rename the IDOMParser
+    parser.parse(xmlFile);
+    DOMDocument* doc = parser.getDocument();          //&lt;==== rename the IDOM_XXXX
+    :
+    return;
+}
+</source>
+    </s3>
+
+    <anchor name="Reuse200"/>
+    <s3 title="Reuse Grammar becomes Grammar Caching">
+        <p>The &XercesCName; 2.0.0 extends the "Reuse Grammar" support by replacing it with
+           a new feature called "Grammar Caching" which provides more flexibility in reusing grammars.
+           Users who used to do the following:</p>
+<source>
+
+      XercesDOMParser parser;
+
+      // this is the first parse, just usual code as you do normal parse
+      // "firstXmlFile" has a grammar (schema or DTD) specified.
+      parser.parse(firstXmlFile);
+
+      // this is the second parse, by setting second parameter to true,
+      // the parser will reuse the grammar in the last parse
+      // (i.e. the one in  "firstXmlFile")
+      // to validate the second "anotherXmlFile".  Any grammar that is
+      // specified in anotherXmlFile is IGNORED.
+      //
+      // Note: The anotherXmlFile cannot have any DTD internal subset.
+      parser.parse(anotherXmlFile, true);
+
+</source>
+        <p>should now use the features cacheGrammarFromParse and useCachedGrammarFromParse:</p>
+<source>
+      XercesDOMParser parser;
+
+      // By setting cacheGrammarFromParse to true,
+      // the parser will cache any grammars encountered in the
+      // follow-on xml files, if not cached already
+      parser.cacheGrammarFromParse(true);
+
+      parser.parse(firstXmlFile);
+
+      // By setting useCachedGrammarFromParse to true,
+      // the parser will use all the previous cached grammars
+      // to validate the follow-on xml files if the cached
+      // grammar matches the one specified in anotherXmlFile.
+      //
+      // Note: The follow-on xml files cannot have any DTD internal subset.
+      parser.useCachedGrammarFromParse(true);
+
+      parser.parse(anotherXmlFile);
+
+      // This will flush the cached grammar pool
+      parser.resetCachedGrammarPool();
+</source>
+
+        <p>Note there are a number of differences between "Reuse Grammar" and "Grammar Caching" </p>
+           <ol>
+              <li>"Reuse Grammar" ignores any grammar that is specified in anotherXmlFile and simply
+                  reuse whatever stored in previous parse; while "Grammar Caching" will use the
+                  cached grammar only if it matches the one specified in the anotherXmlFile.
+                  If not match, then the new grammar is parsed.</li>
+              <li>"Reuse Grammar" can only reuse the grammar from previous parse; while "Grammar Caching"
+                  can selectively cache many grammars from different parses and collect them all in a pool indexed
+                  by targetNamespace (for Schema) or system id (for DTD).</li>
+              <li>Plus "Grammar Caching" has much more functionalities other than above
+                  (like "Pre-parsing Grammar").  Please refer to
+                  <jump href="program-others.html#GrammarCache">Preparsing Grammar and Grammar Caching
+                  </jump> for more programming details.</li>
+           </ol>
+    </s3>
+
+    <anchor name="API200"/>
+    <s3 title="Public API Changes">
+
+        <p>The following lists the public API changes between the &XercesCName;
+           1.7.0; and the &XercesCName; 2.0.0 releases
+           of the parser. </p>
+
+        <anchor name="NewAPI200"/>
+        <s4 title="New Public API">
+            <ul>
+              <li>To support DOM Level 3, the following are added (see
+                  <jump href="api.html">the API documentation page</jump> for details).</li>
+                <ul>
+                  <li>DOMNode functions set/getUserData, isSameNode isEqualNode.</li>
+                  <li>DOMDocument functions renameNode, get/setActualEncoding, get/setEncoding, get/setVersion, get/setStandalone, get/setDocumentURI.</li>
+                  <li>DOMEntity functions get/setActualEncoding, get/setEncoding, get/setVersion.</li>
+                  <li>classes AbstractDOMParser, DOMError, DOMErrorHandler, and DOMLocator.</li>
+                  <li>classes DOMUserDataHandler, DOMImplementationRegistry and DOMImplementationSource.</li>
+                  <li>classes DOMBuilder, DOMEntityResolver, DOMImplementationLS, DOMInputSource,
+                      Wrapper4DOMInputSource and Wrapper4InputSource.</li>
+                  <li>classes DOMWriter, DOMWriterFilter, LocalFileFormatTarget, StdOutFormatTarget,
+                      and MemBufFormatTarget</li>
+                </ul>
+              <li>To support DOMWriter, the following PlatformUtils functions are added</li>
+                <ul>
+                   <li>openFileToWrite, writeBufferToFile</li>
+                </ul>
+              <li>To have Apache Recommended DOM C++ Binding, the following are added (see
+                  <jump href="ApacheDOMC++Binding.html">Apache Recommended DOM C++ binding).</jump></li>
+                <ul>
+                  <li>function release() to fix Memory Management problem</li>
+                  <li>classes DOMDocumentRange and DOMDocumentTraversal</li>
+                  <li>XMLSize_t is used to represent unsigned integral type in DOM</li>
+                  <li>IDOM_XXXX classes are renamed to DOMXXXX, and IDOMParser is renamed to XercesDOMParser
+                      as described in <link anchor="DirChange200">DOM Reorganization</link></li>
+                  <li>XercesDOMParser::adoptDocument is added so that document can optionally live
+                  outside the parser.</li>
+                </ul>
+              <li>To support optionally load external DTD, the following are added:</li>
+                <ul>
+                  <li>XercesDOMParser::set/getLoadExternalDTD</li>
+                  <li>DOMParser::set/getLoadExternalDTD</li>
+                  <li>SAXParser::set/getLoadExternalDTD</li>
+                  <li>and SAX2XMLReader will recognize the feature
+                      http://apache.org/xml/features/nonvalidating/load-external-dtd</li>
+                </ul>
+              <li>To support Preparsing Grammar and Grammar Caching, the following are added:</li>
+                <ul>
+                   <li>XercesDOMParser/DOMParser/SAXParser functions loadGrammar, resetCachedGrammarPool,
+                       cacheGrammarFromParse, isCachingGrammarFromParse, useCachedGrammarInParse,
+                       isUsingCachedGrammarInParse.</li>
+                   <li>SAX2XMLReader functions loadGrammar, resetCachedGrammarPool, and will recognize the features
+                       http://apache.org/xml/features/validation/cache-grammarFromParse and
+                       http://apache.org/xml/features/validation/use-cachedGrammarInParse.</li>
+                </ul>
+              <li>To support access to Grammar info, the following are added:</li>
+                <ul>
+                   <li>XercesDOMParser/DOMParser/SAXParser/SAX2XMLReader functions getRootGrammar, getGrammar, getURIText.</li>
+                </ul>
+              <li>To support strict IANA encoding name checking, the following are added:</li>
+                <ul>
+                   <li>class EncodingValidator.</li>
+                   <li>PlatformUtils functions strictIANAEncoding, isStrictIANAEncoding.</li>
+                   <li>XMLTransService functions strictIANAEncoding, isStrictIANAEncoding.</li>
+                </ul>
+            </ul>
+        </s4>
+
+        <anchor name="ModifiedAPI200"/>
+        <s4 title="Modified Public API">
+            <ul>
+              <li>SAXParser::getScanner() is moved from public to protected.</li>
+              <li>Grammar::getGrammarType has been added a const modifier.</li>
+              <li>Xerces features are renamed from XMLUni::fgSAX2XercesXXXX to XMLUni::fgXercesXXXX
+                  so that they can be shared with DOM parser.</li>
+              <li>With the new Grammar Caching introduced, the the last parameter "reuseGrammar" in
+                  the following API is dropped.
+                   Users should now use the "Grammar Caching" feature as described in
+                   <link anchor="Reuse200">Reuse Grammar becomes Grammar Caching</link>.</li>
+                <ul>
+                   <li>(in Parser, SAXParser, DOMParser, and XercesDOMParser) </li>
+                   <li>parse(const InputSource&amp; source, const bool reuseGrammar = false);</li>
+                   <li>parse(const XMLCh* const systemId, const bool reuseGrammar = false);</li>
+                   <li>parse(const char* const systemId, const bool reuseGrammar = false);</li>
+                   <li>(in SAXParser, DOMParser, and XercesDOMParser) </li>
+                   <li>parseFirst(const InputSource&amp; source, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
+                   <li>parseFirst(const XMLCh* const systemId, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
+                   <li>parseFirst(const char* const systemId, XMLPScanToken&amp;  toFill, const bool reuseGrammar = false);</li>
+                </ul>
+            </ul>
+        </s4>
+
+        <anchor name="DeprecatedAPI200"/>
+        <s4 title="Deprecated/Removed Public API">
+            <ul>
+              <li>The old Java-like DOM is now deprecated as described in
+                  <link anchor="DirChange200">DOM Reorganization</link></li>
+              <li>SAX2XMLReader::setValidationConstraint.   For consistency, SAX2XMLReader users should
+                  set the feature http://apache.org/xml/features/validation-error-as-fatal" instead.</li>
+              <li>SAX2XMLReader::setExitOnFirstFatalError.  For consistency, SAX2XMLReader users should
+                  set the feature "http://apache.org/xml/features/continue-after-fatal-error" instead.</li>
+              <li>With the new Grammar Caching introduced, the following features will not be
+                  recognized by the SAX2XMLReader:</li>
+                <ul>
+                   <li>http://apache.org/xml/features/validation/reuse-grammar</li>
+                   <li>http://apache.org/xml/features/validation/reuse-validator</li>
+                </ul>
+            </ul>
+        </s4>
+    </s3>
+    </s2>
+
     <anchor name="Migrateto170"/>
     <s2 title="Migrating from &XercesCName; 1.6.0 to 1.7.0">
       <p>The following section is a discussion of the technical differences between
@@ -20,7 +340,7 @@
       <ul>
         <li>Support SAX2-ext's DeclHandler.</li>
         <li>Directory sane_include reorganization: add sub-directory 'xercesc' to src / include folder.
-            See <link anchor="DirChange2">"Directory change in &XercesCName; 1.7.0"</link>
+            See <link anchor="DirChange170">"Directory change in &XercesCName; 1.7.0"</link>
             below for detail.</li>
         <li>More IDOM test cases - port IDOMMemTest, and merge ThreadTest and IThreadTest.</li>
         <li>Support IconvFBSD in multi-threading environment.</li>
@@ -32,7 +352,7 @@
       </ul>
     </s3>
 
-    <anchor name="DirChange2"/>
+    <anchor name="DirChange170"/>
     <s3 title="Directory change in &XercesCName; 1.7.0">
         <ul>
             <li>A new directory, <em>src/xercesc</em> is created to be the new parent directory of
diff --git a/doc/releases.xml b/doc/releases.xml
index 09221812396d575bb2206579b1c97abf51af3845..56d31ed4ecc4af219a87275e1bc349fc807d8de6 100644
--- a/doc/releases.xml
+++ b/doc/releases.xml
@@ -12,12 +12,12 @@
 
 <s2 title="Releases Archive">
 
-    <p> For release information about &XercesCName; 1.7.0 or earlier,
+    <p> For release information about &XercesCName; 2.0.0 or earlier,
         please refer to <jump href="releases_archive.html">Releases Archive</jump>.
     </p>
 </s2>
 
-<s2 title="Release Information of &XercesCName; &XercesCVersion;: July 23, 2002">
+<s2 title="Release Information of &XercesCName; &XercesCVersion;: August 23, 2002">
 <table>
     <tr>
         <td>Date</td>
@@ -26,919 +26,193 @@
     </tr>
 
     <tr>
-        <td>2002-07-19</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10968] Default attributes from Schema not restored by removeAttribute.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-18</td>
-        <td>Khaled Noaman</td>
-        <td>Feature to control strict IANA encoding name.
+        <td>2002-08-08</td>
+        <td>Stephen Dulin</td>
+        <td>DOMWriter support on z/OS.
         </td>
     </tr>
 
     <tr>
-        <td>2002-07-18</td>
+        <td>2002-08-08</td>
         <td>Tinny Ng</td>
-        <td>[Bug 9707] config.guess out of date.   From AutoConf dated July 18, 2002, CVS Tag  AUTOCONF-2_53b.
+        <td>DOM Fix: Recycle node value buffer to avoid memory growth.
         </td>
     </tr>
 
     <tr>
-        <td>2002-07-17</td>
+        <td>2002-08-07</td>
         <td>PeiYong Zhang</td>
-        <td>Add Win64 to Windows VC6 Project files
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6070] warning unused variable in HandlerBase.hpp.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6576] Exception on processing UTF-16 InputSource buffer with set encoding.
+        <td>[Bug 11534] Wrong CDATA Terminator in DOMWriterImpl.
         </td>
     </tr>
 
     <tr>
-        <td>2002-07-16</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6590] Improper Internal subset filling.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Alberto Massari</td>
-        <td>[Bug 7458] Schema validator does not automatically associate the xml prefix
-            to the "http://www.w3.org/XML/1998/namespace" URI.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Case Larsen</td>
-        <td>[Bug 9502] purify UMR in DocumentImpl::DocumentImpl.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Case Larsen</td>
-        <td>[Bug 9553] purify UMR in XMLRecognizer::basicEncodingProbe.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10651] CMStateSet.hpp includes both memory.h and string.h.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-16</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10648] DOMDocumentImpl misaligned allocations on machines with a 64 bits 'long' type.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-15</td>
-        <td>Tinny Ng</td>
-        <td>DOM Level 3 C++ Binding.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-15</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: DOMText::getIsWhitespaceInElementContent, DOMDocument::set/getStrictErrorChecking.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-15</td>
-        <td>Robert Buck</td>
-        <td>[Bug 10834] Update version header to handle two digit revision and patch levels.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-12</td>
+        <td>2002-08-07</td>
         <td>Khaled Noaman</td>
-        <td>Grammar caching/preparsing.
+        <td>Pass proper value of actual encoding to XMLDecl callback.
         </td>
     </tr>
 
     <tr>
-        <td>2002-07-12</td>
+        <td>2002-08-01</td>
         <td>Khaled Noaman</td>
-        <td>Add getRootGrammar and modify SEnumVal.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-12</td>
-        <td>James Berry</td>
-        <td>Add some support for testing of Mac OS X builds with GCC3 compiler.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-12</td>
-        <td>James Berry</td>
-        <td>[Bug 10649] XercesDefs.hpp and AutoSense.hpp assume CodeWarrior is MacOS.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-10</td>
-        <td>Tinny Ng</td>
-        <td>Enable embedded path link option in HP.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-10</td>
-        <td>Robert Buck</td>
-        <td>[Bug 9154] Requesting Xerces Version Macro.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-08</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 10525] runConfigure fails to recognize '-d' flag.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Max Gotlib</td>
-        <td>[Bug 10250]: Implementation of new platform methods in FreeBSD.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 9788] VecAttrListImpl::getValue skips prefix if SAX namespace validation is on.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Robert Buck</td>
-        <td>[Bug 10065] xml4com bugs found when porting to Visual Studio .NET project files.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10105] Exception in parse() despite setErrorHandler().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10119] Grammar::getGrammarType need a const modifier.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-05</td>
-        <td>Max Gotlib</td>
-        <td>[Bug 10252] Modify FreeBSD build environment for the samples.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-04</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 10482] XMLUri crashes with empty fragment.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-04</td>
-        <td>Max Gotlib</td>
-        <td>[Bug 10253] Bugfix for the IconvFBSD transcoder.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-04</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 10336] Error in Error Message (set 3, #56, English).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-07-04</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: Add DOMDocument::renameNode.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-27</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: Add DOMNode::isSameNode and DOMNode::isEqualNode.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-25</td>
-        <td>Tinny Ng</td>
-        <td>Add "adoptDocument" to XercesDOMParser so that document can optionally live outside the parser.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-25</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7675] IDOM memory management problem.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-25</td>
-        <td>Tinny Ng</td>
-        <td>DOM C++ Binding: add function release().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-24</td>
-        <td>James Berry</td>
-        <td>Support CodeWarrior 8.
-            (Important Note: Since Codewarrior 8 at long last supports HFS+ long file
-             names, these projects now directly reference the src/xercesc files instead of
-             the previously shortened file names in the MacSrc directory. With CodeWarrior
-             8 and these projects it is no longer necessary to run the perl script
-             ShortenNames.pl to generate that MacSrc directory.)
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-24</td>
-        <td>Robert Buck</td>
-        <td>[Bug 10067] SEnumVal bugs found when porting to Visual Studio .NET.
+        <td>If the NamespaceURI, qualifiedName, and doctype are null, the returned
+            Document is empty with no document element.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-24</td>
-        <td>Robert Buck</td>
-        <td>[Bug 10180] New Visual Studio .NET Project Files.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-18</td>
+        <td>2002-08-01</td>
         <td>Khaled Noaman</td>
-        <td>DOM L3: Add Wrapper4DOMInputSource and Wrapper4InputSource.
+        <td>Ensure that we add only DOM Attr nodes to the attributes NamedNodeMap.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-18</td>
+        <td>2002-08-01</td>
         <td>Khaled Noaman</td>
-        <td>DOM L3: Modify DOMCount to modify DOMBuilder.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-18</td>
-        <td>Peter A. Volchek</td>
-        <td>Bug#9950: Compilation error on MSVC5.
+        <td>DOM L2 does not support editing DocumentType nodes.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-17</td>
+        <td>2002-07-31</td>
         <td>Tinny Ng</td>
-        <td>Add feature "http://apache.org/xml/features/validation-error-as-fatal", and users should
-            use setFeature instead of setValidationConstraintFatal in SAX2XMLReader.
+        <td>[Bug 11338] missing const keyword for DOMNodeList methods.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-17</td>
+        <td>2002-07-31</td>
         <td>Tinny Ng</td>
-        <td>Add feature "http://apache.org/xml/features/continue-after-fatal-error", and users should
-            use setFeature instead of setExitOnFirstFatalError in SAX2XMLReader.
+        <td>[Bug 6227] Make method getLastExtLocation() constant.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-17</td>
+        <td>2002-07-31</td>
         <td>Tinny Ng</td>
-        <td>Name Xerces features as XMLUni::fgXercesXXXX instead of XMLUni::fgSAX2XercesXXXX
-            so that they can be shared with DOM parser.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-14</td>
-        <td>PeiYong Zhang</td>
-        <td>Build 64bit production on Itaniums platform (Windows and Linux) using Intel Compiler.
+        <td>[Bug 3788] very long lines in CppErrMsgs_EN_US.hpp causes problems for OS390 compiler.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-12</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: Add DOMUserDataHandler, DOMNode::set/getUserData.
+        <td>2002-07-31</td>
+        <td>Eric Zurcher</td>
+        <td>[Bug 11099]  BCB6 project for Xerceslib 2.0 has wrong files.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-12</td>
+        <td>2002-07-31</td>
         <td>Tinny Ng</td>
-        <td>Fix: Thread-safety in DOMString.  The reference or update to DOMString::gLiveStringHandleCount should be synchronized (locked).
+        <td>[Bug 6321] gmake error in regx/Makefile.in.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-07</td>
+        <td>2002-07-30</td>
         <td>Tinny Ng</td>
-        <td>DOM L3: Add Entity::get/setActualEncoding, get/setEncoding, get/setVersion.
+        <td>[Bug 8550] No explanation of XMLFormatter escape options.
         </td>
     </tr>
 
     <tr>
-        <td>2002-06-07</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: Add Document::get/setActualEncoding, get/setEncoding, get/setVersion, get/setStandalone, get/setDocumentURI.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-06-03</td>
-        <td>Tinny Ng</td>
-        <td>DOM L3: Add DOMImplementationRegistry and DOMImplementationSource.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-30</td>
-        <td>Tinny Ng</td>
-        <td>Add feature http://apache.org/xml/features/nonvalidating/load-external-dtd to
-            optionally ignore external DTD.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-29</td>
+        <td>2002-07-30</td>
         <td>Khaled Noaman</td>
-        <td>DOM L3: Add DOMInputSource, DOMEntityResolver, DOMImplementationLS and DOMBuilder.
+        <td>Create default attributes with the namespace URI mapped to the attributes' prefixes.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-29</td>
-        <td>Gereon Steffens</td>
-        <td>[Bug 9489] Malformed HTTP GET Requests in UnixHTTPUrlInputStream.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-28</td>
-        <td>PeiYong Zhang</td>
-        <td>DOM L3: Modify DOMPrint to use DOMWriter.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-28</td>
+        <td>2002-07-29</td>
         <td>PeiYong Zhang</td>
-        <td>DOM L3: Add DOMWriter, DOMWriterFilter, LocalFileFormatTarget, StdOutFormatTarget, and MemBufFormatTarget.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-28</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 9104] prefixes dissapearing when schema validation turned on.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-27</td>
-        <td>Tinny Ng</td>
-        <td>Add DOMDocumentRange and DOMDocumentTraversal.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-27</td>
-        <td>Khaled Noaman</td>
-        <td>Performance: Lazily store top-level components to eliminate unnecessary traversal
-            of DOM tree when looking up for a top level component.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-27</td>
-        <td>Khaled Noaman</td>
-        <td>Performance: Use pre-built element-attribute map table.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-27</td>
-        <td>Tinny Ng</td>
-        <td>To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
+        <td>Build Xerces with ICU -- Itanium/WinXP/IntelC++Compiler.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-27</td>
+        <td>2002-07-29</td>
         <td>Tinny Ng</td>
-        <td>Define XMLSize, XMLSSize_t and their associate MAX.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-24</td>
-        <td>Khaled Noaman</td>
-        <td>Performance: Eliminate mulitple calls to addRange and sort in regx.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-23</td>
-        <td>Khaled Noaman</td>
-        <td>Performance: Use XMLBufferMgr instead of local creation of XMLBuffer(s).
+        <td>[Bug 9084] scripts/packageBinaries -j option not well documented.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-22</td>
-        <td>Khaled Noaman</td>
-        <td>DOM L3: Add AbstractDOMParser, DOMError, DOMErrorHandler, and DOMLocator.
+        <td>2002-07-29</td>
+        <td>Tom Keane</td>
+        <td>[Bug 9533] Win32TransService does not recognize aliases for encodings.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-21</td>
+        <td>2002-07-26</td>
         <td>Tinny Ng</td>
-        <td>DOM Reorganization (rename IDOM and deprecate old DOM) and other documentation update.
+        <td>Memory Leak in DOMDocumentTypeImpl.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-19</td>
-        <td>James Berry</td>
-        <td>[Bug 9237] Encoding spec in lower case (DTD/XML) not recognized.
+        <td>2002-07-26</td>
+        <td>Joé St-Germain</td>
+        <td>[Bug 10337] XMLString::patternMatch doesn't find pattern in particular context.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-10</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 8967] Default element behaviour is incorrect (schema only).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-08</td>
-        <td>Martin Kalen</td>
-        <td>[Bug 7701] NameIdPoolEnumerator copy constructor should call base class.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-08</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8899] Missing implementation of Op::Op(const Op&amp;) causes Intel C++ Win32 link to fail.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-08</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 8301] INFINITY used as enum member.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-08</td>
+        <td>2002-07-26</td>
         <td>David Bertoni</td>
-        <td>[Bug 8381] XMLScanner performance fixes.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-08</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8898] SchemaElementDecl doesn't compile with Intel C++ for IA32.
+        <td>[Bug 11189] Tru64 utilities missing implementation of new functions.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-07</td>
-        <td>Tinny Ng</td>
-        <td>Schema Fix: re-add the ID, IDREF ... datatype validators only if they were not there.
+        <td>2002-07-26</td>
+        <td>Jonathan Lennox</td>
+        <td>[Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-07</td>
+        <td>2002-07-26</td>
         <td>Khaled Noaman</td>
-        <td>Update SAX2 documentation to tell users it is necessary to delete
-            the parser returned by XMLReaderFactory::createXMLReader.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-07</td>
-        <td>David Bertoni</td>
-        <td>[Bug 8852] UnixHTTPURLInputStream.cpp includes unneeded file.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-06</td>
-        <td>David Bertoni</td>
-        <td>[Bug 8492] Incorrect HP link options.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-03</td>
-        <td>Martin Kalen</td>
-        <td>[Bug 7341] Missing newline at end of util and DOM source files.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-03</td>
-        <td>Martin Kalen</td>
-        <td>[Bug 7261] Remove obsolete define in UnixWareDefs.hpp.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-05-03</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8769] UMR (uninitialized memory read) detected by memory tool.
+        <td>For a given DOM Element and DOM DocumentType node, explicitly cast to
+            the implementation of that DOM node when calling setReadOnly.
         </td>
     </tr>
 
     <tr>
-        <td>2002-05-01</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7265] UnixWare port broken in platformTerm().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-24</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 8495] URLInputSource constructor initializes fURL member incorrectly.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-22</td>
-        <td>PeiYong Zhang</td>
-        <td>Build AIX 64 bit binary.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-19</td>
+        <td>2002-07-26</td>
         <td>Khaled Noaman</td>
-        <td>[Bug 8236] Problem with recursive and derived elements.
+        <td>Public/System id for notations should be stored as NULL if missing.
         </td>
     </tr>
 
     <tr>
-        <td>2002-04-18</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 7301] Redundant range-check in HexBin.cpp.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-17</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7583] Build warnings with MS Visual Studio .NET.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-17</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7493] The word "occured" is misspelled and it is a global error.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-17</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8195] Invalid path to build 'samples' target.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-16</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8156] Bad path name breaks build.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-16</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 8168] Error when attempting to build NetAccessors.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-09</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 7706] XMLString::lowerCase() does not work.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-09</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 6095] Modify .so name to have version number.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-08</td>
-        <td>Tinny Ng</td>
-        <td>ICU 2.0.2 Update.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-04</td>
-        <td>Khaled Noaman</td>
-        <td>Change min/maxOccurs from unsigned int to int.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-03</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 7565] Attributes in different namespaces produce a Fatal Exception.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-03</td>
-        <td>Tinny Ng</td>
-        <td>check null string first in isWSCollapsed and fix [Bug 6902] Typo in XMLString.cpp.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-02</td>
-        <td>Martin Kalen</td>
-        <td>[Bug 7555] Enable AIX build with newer xlC versions.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-02</td>
-        <td>Khaled Noaman</td>
-        <td>Modiy QName comparison (operator==).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Tinny Ng</td>
-        <td>According to DOM spec, setNodeValue by default is no-op.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Tinny Ng</td>
-        <td>Do not issue DOM_DOMException::INUSE_ATTRIBUTE_ERR if the owner is the same.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Tinny Ng</td>
-        <td>DOMString problem with Asian codepages.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 7551] Exceptions are caught by value, rather than by reference.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7585] xml4com.dsp - Cannot open source file.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 7297] Validation of schema included in document fails with improper error.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-04-01</td>
-        <td>Khaled Noaman</td>
-        <td>Move Element Consistency checking (ref to global declarations) to SchemaValidator.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-27</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 1173] DOMParser entity resolution property is messed about.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-27</td>
-        <td>Tinny Ng</td>
-        <td>Fix: not all the children of EntityReference Node is set to readOnly.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-27</td>
-        <td>Tinny Ng</td>
-        <td>Should call setReadOnly instead of isReadOnly to populate the flag.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-27</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 3010] DocumentImpl::importNode - Missed Readonly Flag Restore.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-27</td>
-        <td>Tinny Ng</td>
-        <td>Correct count element routine in IDOMCount.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-26</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 7471] Failed to validate correctly when schema has &lt;xsd:extension&gt; and the base has an attribute.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-25</td>
-        <td>Khaled Noaman</td>
-        <td>Move particle derivation checking from TraverseSchema to SchemaValidator.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-22</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 7358] About TraverseSchema::traverseSimpleTypeDecl member function.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-21</td>
-        <td>Khaled Noaman</td>
-        <td>Add support for reporting line/column numbers of schema errors.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-19</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 7164] DOMParser with a DTD leak!
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-19</td>
-        <td>Khaled Noaman</td>
-        <td>Fix for declarations referenced from a different NS in the case of a circular import.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-19</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 7243] Base64 encoding is not working.
+        <td>2002-07-25</td>
+        <td>Robert Buck</td>
+        <td>[Bug 11141] Fix To Broken VC7 Builds.
         </td>
     </tr>
 
     <tr>
-        <td>2002-03-19</td>
+        <td>2002-07-25</td>
         <td>Khaled Noaman</td>
-        <td>[Bug 7074] Unwarranted error regarding "no circular definitions allowed".
+        <td>[Bug 11153] getOwnerDocument() on PI that's child of Document returns NULL.
         </td>
     </tr>
 
     <tr>
-        <td>2002-03-18</td>
+        <td>2002-07-24</td>
         <td>Khaled Noaman</td>
-        <td>[Regx Fix] Change constant names to eliminate possible conflict with user defined ones.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-18</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 7162] IconvFreeBSDTransService.cpp needs an #include statement fixed to use xercesc.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-15</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6888] NodeIterator.  Retrofit this typo that was applied to Xerces-J, although this
-            function "matchNodeOrParent" is not used in Xerces-C++.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-15</td>
-        <td>Tinny Ng</td>
-        <td>DOMString Thread safe Fix: should lock the entire deleter function where freeListPtr and
-            blockListPtr are modified.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-15</td>
-        <td>Tinny Ng</td>
-        <td>Issue DOMException::INDEX_SIZE_ERR if count is greater than length, equal to length is ok.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-14</td>
-        <td>Tinny Ng</td>
-        <td>IDOM Fix: Issue IDOM_DOMException::INDEX_SIZE_ERR if count or offset is negative.
+        <td>Remove check for disallowed encodings - not needed anymore.
         </td>
     </tr>
 
     <tr>
-        <td>2002-03-14</td>
+        <td>2002/07/23</td>
         <td>Tinny Ng</td>
-        <td>IDOM Fix: Initialize fPublic/fSystemId to zero in IDNotationImpl.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-14</td>
-        <td>Tinny Ng</td>
-        <td>Certain IDOM Node should call fParent.normalize().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-14</td>
-        <td>Tinny Ng</td>
-        <td>Run methods test[NodeType] in the IDOMTest and other fixes.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-12</td>
-        <td>Mark Russell</td>
-        <td>[Bug 1687] resValue not always updated when making a transcoder.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002/03/11</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 7000] The URL is corrupted in UnixHTTPURLInputStream.cpp.
+        <td>Build with ICU 2.2.
         </td>
     </tr>
 
diff --git a/doc/releases_archive.xml b/doc/releases_archive.xml
index 1dfc34aea55c63dfe40f810435b1d3073ad14596..16cfb72f59464be5eff453380af7ee28d64f6998 100644
--- a/doc/releases_archive.xml
+++ b/doc/releases_archive.xml
@@ -4,6 +4,7 @@
 <s1 title="Releases Archive">
     <s2 title="Release Information of earlier releases">
       <ul>
+        <li><link anchor="Release200">Release Information of &XercesCName; 2.0.0</link></li>
         <li><link anchor="Release170">Release Information of &XercesCName; 1.7.0</link></li>
         <li><link anchor="Release160">Release Information of &XercesCName; 1.6.0</link></li>
         <li><link anchor="Release152">Release Information of &XercesCName; 1.5.2</link></li>
@@ -19,6 +20,935 @@
       </ul>
     </s2>
 
+    <anchor name="Release200"/>
+    <s2 title="Release Information of &XercesCName; 2.0.0: July 23, 2002">
+    <table>
+        <tr>
+            <td>Date</td>
+            <td>Contributor</td>
+            <td>Description</td>
+        </tr>
+
+        <tr>
+            <td>2002-07-19</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10968] Default attributes from Schema not restored by removeAttribute.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-18</td>
+            <td>Khaled Noaman</td>
+            <td>Feature to control strict IANA encoding name.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-18</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 9707] config.guess out of date.   From AutoConf dated July 18, 2002, CVS Tag  AUTOCONF-2_53b.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-17</td>
+            <td>PeiYong Zhang</td>
+            <td>Add Win64 to Windows VC6 Project files
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 6070] warning unused variable in HandlerBase.hpp.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 6576] Exception on processing UTF-16 InputSource buffer with set encoding.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 6590] Improper Internal subset filling.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Alberto Massari</td>
+            <td>[Bug 7458] Schema validator does not automatically associate the xml prefix
+                to the "http://www.w3.org/XML/1998/namespace" URI.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Case Larsen</td>
+            <td>[Bug 9502] purify UMR in DocumentImpl::DocumentImpl.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Case Larsen</td>
+            <td>[Bug 9553] purify UMR in XMLRecognizer::basicEncodingProbe.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10651] CMStateSet.hpp includes both memory.h and string.h.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-16</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10648] DOMDocumentImpl misaligned allocations on machines with a 64 bits 'long' type.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-15</td>
+            <td>Tinny Ng</td>
+            <td>DOM Level 3 C++ Binding.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-15</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: DOMText::getIsWhitespaceInElementContent, DOMDocument::set/getStrictErrorChecking.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-15</td>
+            <td>Robert Buck</td>
+            <td>[Bug 10834] Update version header to handle two digit revision and patch levels.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-12</td>
+            <td>Khaled Noaman</td>
+            <td>Grammar caching/preparsing.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-12</td>
+            <td>Khaled Noaman</td>
+            <td>Add getRootGrammar and modify SEnumVal.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-12</td>
+            <td>James Berry</td>
+            <td>Add some support for testing of Mac OS X builds with GCC3 compiler.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-12</td>
+            <td>James Berry</td>
+            <td>[Bug 10649] XercesDefs.hpp and AutoSense.hpp assume CodeWarrior is MacOS.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-10</td>
+            <td>Tinny Ng</td>
+            <td>Enable embedded path link option in HP.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-10</td>
+            <td>Robert Buck</td>
+            <td>[Bug 9154] Requesting Xerces Version Macro.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-08</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 10525] runConfigure fails to recognize '-d' flag.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Max Gotlib</td>
+            <td>[Bug 10250]: Implementation of new platform methods in FreeBSD.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 9788] VecAttrListImpl::getValue skips prefix if SAX namespace validation is on.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Robert Buck</td>
+            <td>[Bug 10065] xml4com bugs found when porting to Visual Studio .NET project files.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10105] Exception in parse() despite setErrorHandler().
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10119] Grammar::getGrammarType need a const modifier.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-05</td>
+            <td>Max Gotlib</td>
+            <td>[Bug 10252] Modify FreeBSD build environment for the samples.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-04</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 10482] XMLUri crashes with empty fragment.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-04</td>
+            <td>Max Gotlib</td>
+            <td>[Bug 10253] Bugfix for the IconvFBSD transcoder.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-04</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 10336] Error in Error Message (set 3, #56, English).
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-07-04</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add DOMDocument::renameNode.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-27</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add DOMNode::isSameNode and DOMNode::isEqualNode.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-25</td>
+            <td>Tinny Ng</td>
+            <td>Add "adoptDocument" to XercesDOMParser so that document can optionally live outside the parser.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-25</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7675] IDOM memory management problem.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-25</td>
+            <td>Tinny Ng</td>
+            <td>DOM C++ Binding: add function release().
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-24</td>
+            <td>James Berry</td>
+            <td>Support CodeWarrior 8.
+                (Important Note: Since Codewarrior 8 at long last supports HFS+ long file
+                 names, these projects now directly reference the src/xercesc files instead of
+                 the previously shortened file names in the MacSrc directory. With CodeWarrior
+                 8 and these projects it is no longer necessary to run the perl script
+                 ShortenNames.pl to generate that MacSrc directory.)
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-24</td>
+            <td>Robert Buck</td>
+            <td>[Bug 10067] SEnumVal bugs found when porting to Visual Studio .NET.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-24</td>
+            <td>Robert Buck</td>
+            <td>[Bug 10180] New Visual Studio .NET Project Files.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-18</td>
+            <td>Khaled Noaman</td>
+            <td>DOM L3: Add Wrapper4DOMInputSource and Wrapper4InputSource.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-18</td>
+            <td>Khaled Noaman</td>
+            <td>DOM L3: Modify DOMCount to modify DOMBuilder.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-18</td>
+            <td>Peter A. Volchek</td>
+            <td>Bug#9950: Compilation error on MSVC5.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-17</td>
+            <td>Tinny Ng</td>
+            <td>Add feature "http://apache.org/xml/features/validation-error-as-fatal", and users should
+                use setFeature instead of setValidationConstraintFatal in SAX2XMLReader.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-17</td>
+            <td>Tinny Ng</td>
+            <td>Add feature "http://apache.org/xml/features/continue-after-fatal-error", and users should
+                use setFeature instead of setExitOnFirstFatalError in SAX2XMLReader.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-17</td>
+            <td>Tinny Ng</td>
+            <td>Name Xerces features as XMLUni::fgXercesXXXX instead of XMLUni::fgSAX2XercesXXXX
+                so that they can be shared with DOM parser.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-14</td>
+            <td>PeiYong Zhang</td>
+            <td>Build 64bit production on Itaniums platform (Windows and Linux) using Intel Compiler.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-12</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add DOMUserDataHandler, DOMNode::set/getUserData.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-12</td>
+            <td>Tinny Ng</td>
+            <td>Fix: Thread-safety in DOMString.  The reference or update to DOMString::gLiveStringHandleCount should be synchronized (locked).
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-07</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add Entity::get/setActualEncoding, get/setEncoding, get/setVersion.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-07</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add Document::get/setActualEncoding, get/setEncoding, get/setVersion, get/setStandalone, get/setDocumentURI.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-06-03</td>
+            <td>Tinny Ng</td>
+            <td>DOM L3: Add DOMImplementationRegistry and DOMImplementationSource.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-30</td>
+            <td>Tinny Ng</td>
+            <td>Add feature http://apache.org/xml/features/nonvalidating/load-external-dtd to
+                optionally ignore external DTD.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-29</td>
+            <td>Khaled Noaman</td>
+            <td>DOM L3: Add DOMInputSource, DOMEntityResolver, DOMImplementationLS and DOMBuilder.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-29</td>
+            <td>Gereon Steffens</td>
+            <td>[Bug 9489] Malformed HTTP GET Requests in UnixHTTPUrlInputStream.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-28</td>
+            <td>PeiYong Zhang</td>
+            <td>DOM L3: Modify DOMPrint to use DOMWriter.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-28</td>
+            <td>PeiYong Zhang</td>
+            <td>DOM L3: Add DOMWriter, DOMWriterFilter, LocalFileFormatTarget, StdOutFormatTarget, and MemBufFormatTarget.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-28</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 9104] prefixes dissapearing when schema validation turned on.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-27</td>
+            <td>Tinny Ng</td>
+            <td>Add DOMDocumentRange and DOMDocumentTraversal.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-27</td>
+            <td>Khaled Noaman</td>
+            <td>Performance: Lazily store top-level components to eliminate unnecessary traversal
+                of DOM tree when looking up for a top level component.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-27</td>
+            <td>Khaled Noaman</td>
+            <td>Performance: Use pre-built element-attribute map table.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-27</td>
+            <td>Tinny Ng</td>
+            <td>To get ready for 64 bit large file, use XMLSSize_t to represent line and column number.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-27</td>
+            <td>Tinny Ng</td>
+            <td>Define XMLSize, XMLSSize_t and their associate MAX.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-24</td>
+            <td>Khaled Noaman</td>
+            <td>Performance: Eliminate mulitple calls to addRange and sort in regx.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-23</td>
+            <td>Khaled Noaman</td>
+            <td>Performance: Use XMLBufferMgr instead of local creation of XMLBuffer(s).
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-22</td>
+            <td>Khaled Noaman</td>
+            <td>DOM L3: Add AbstractDOMParser, DOMError, DOMErrorHandler, and DOMLocator.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-21</td>
+            <td>Tinny Ng</td>
+            <td>DOM Reorganization (rename IDOM and deprecate old DOM) and other documentation update.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-19</td>
+            <td>James Berry</td>
+            <td>[Bug 9237] Encoding spec in lower case (DTD/XML) not recognized.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-10</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 8967] Default element behaviour is incorrect (schema only).
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-08</td>
+            <td>Martin Kalen</td>
+            <td>[Bug 7701] NameIdPoolEnumerator copy constructor should call base class.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-08</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8899] Missing implementation of Op::Op(const Op&amp;) causes Intel C++ Win32 link to fail.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-08</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 8301] INFINITY used as enum member.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-08</td>
+            <td>David Bertoni</td>
+            <td>[Bug 8381] XMLScanner performance fixes.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-08</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8898] SchemaElementDecl doesn't compile with Intel C++ for IA32.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-07</td>
+            <td>Tinny Ng</td>
+            <td>Schema Fix: re-add the ID, IDREF ... datatype validators only if they were not there.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-07</td>
+            <td>Khaled Noaman</td>
+            <td>Update SAX2 documentation to tell users it is necessary to delete
+                the parser returned by XMLReaderFactory::createXMLReader.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-07</td>
+            <td>David Bertoni</td>
+            <td>[Bug 8852] UnixHTTPURLInputStream.cpp includes unneeded file.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-06</td>
+            <td>David Bertoni</td>
+            <td>[Bug 8492] Incorrect HP link options.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-03</td>
+            <td>Martin Kalen</td>
+            <td>[Bug 7341] Missing newline at end of util and DOM source files.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-03</td>
+            <td>Martin Kalen</td>
+            <td>[Bug 7261] Remove obsolete define in UnixWareDefs.hpp.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-03</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8769] UMR (uninitialized memory read) detected by memory tool.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-05-01</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7265] UnixWare port broken in platformTerm().
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-24</td>
+            <td>Jason Stewart</td>
+            <td>[Bug 8495] URLInputSource constructor initializes fURL member incorrectly.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-22</td>
+            <td>PeiYong Zhang</td>
+            <td>Build AIX 64 bit binary.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-19</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 8236] Problem with recursive and derived elements.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-18</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 7301] Redundant range-check in HexBin.cpp.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-17</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7583] Build warnings with MS Visual Studio .NET.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-17</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7493] The word "occured" is misspelled and it is a global error.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-17</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8195] Invalid path to build 'samples' target.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-16</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8156] Bad path name breaks build.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-16</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 8168] Error when attempting to build NetAccessors.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-09</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7706] XMLString::lowerCase() does not work.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-09</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 6095] Modify .so name to have version number.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-08</td>
+            <td>Tinny Ng</td>
+            <td>ICU 2.0.2 Update.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-04</td>
+            <td>Khaled Noaman</td>
+            <td>Change min/maxOccurs from unsigned int to int.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-03</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7565] Attributes in different namespaces produce a Fatal Exception.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-03</td>
+            <td>Tinny Ng</td>
+            <td>check null string first in isWSCollapsed and fix [Bug 6902] Typo in XMLString.cpp.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-02</td>
+            <td>Martin Kalen</td>
+            <td>[Bug 7555] Enable AIX build with newer xlC versions.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-02</td>
+            <td>Khaled Noaman</td>
+            <td>Modiy QName comparison (operator==).
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Tinny Ng</td>
+            <td>According to DOM spec, setNodeValue by default is no-op.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Tinny Ng</td>
+            <td>Do not issue DOM_DOMException::INUSE_ATTRIBUTE_ERR if the owner is the same.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Tinny Ng</td>
+            <td>DOMString problem with Asian codepages.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 7551] Exceptions are caught by value, rather than by reference.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7585] xml4com.dsp - Cannot open source file.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7297] Validation of schema included in document fails with improper error.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-04-01</td>
+            <td>Khaled Noaman</td>
+            <td>Move Element Consistency checking (ref to global declarations) to SchemaValidator.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-27</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 1173] DOMParser entity resolution property is messed about.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-27</td>
+            <td>Tinny Ng</td>
+            <td>Fix: not all the children of EntityReference Node is set to readOnly.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-27</td>
+            <td>Tinny Ng</td>
+            <td>Should call setReadOnly instead of isReadOnly to populate the flag.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-27</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 3010] DocumentImpl::importNode - Missed Readonly Flag Restore.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-27</td>
+            <td>Tinny Ng</td>
+            <td>Correct count element routine in IDOMCount.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-26</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7471] Failed to validate correctly when schema has &lt;xsd:extension&gt; and the base has an attribute.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-25</td>
+            <td>Khaled Noaman</td>
+            <td>Move particle derivation checking from TraverseSchema to SchemaValidator.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-22</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7358] About TraverseSchema::traverseSimpleTypeDecl member function.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-21</td>
+            <td>Khaled Noaman</td>
+            <td>Add support for reporting line/column numbers of schema errors.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-19</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 7164] DOMParser with a DTD leak!
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-19</td>
+            <td>Khaled Noaman</td>
+            <td>Fix for declarations referenced from a different NS in the case of a circular import.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-19</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 7243] Base64 encoding is not working.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-19</td>
+            <td>Khaled Noaman</td>
+            <td>[Bug 7074] Unwarranted error regarding "no circular definitions allowed".
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-18</td>
+            <td>Khaled Noaman</td>
+            <td>[Regx Fix] Change constant names to eliminate possible conflict with user defined ones.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-18</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 7162] IconvFreeBSDTransService.cpp needs an #include statement fixed to use xercesc.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-15</td>
+            <td>Tinny Ng</td>
+            <td>[Bug 6888] NodeIterator.  Retrofit this typo that was applied to Xerces-J, although this
+                function "matchNodeOrParent" is not used in Xerces-C++.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-15</td>
+            <td>Tinny Ng</td>
+            <td>DOMString Thread safe Fix: should lock the entire deleter function where freeListPtr and
+                blockListPtr are modified.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-15</td>
+            <td>Tinny Ng</td>
+            <td>Issue DOMException::INDEX_SIZE_ERR if count is greater than length, equal to length is ok.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-14</td>
+            <td>Tinny Ng</td>
+            <td>IDOM Fix: Issue IDOM_DOMException::INDEX_SIZE_ERR if count or offset is negative.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-14</td>
+            <td>Tinny Ng</td>
+            <td>IDOM Fix: Initialize fPublic/fSystemId to zero in IDNotationImpl.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-14</td>
+            <td>Tinny Ng</td>
+            <td>Certain IDOM Node should call fParent.normalize().
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-14</td>
+            <td>Tinny Ng</td>
+            <td>Run methods test[NodeType] in the IDOMTest and other fixes.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002-03-12</td>
+            <td>Mark Russell</td>
+            <td>[Bug 1687] resValue not always updated when making a transcoder.
+            </td>
+        </tr>
+
+        <tr>
+            <td>2002/03/11</td>
+            <td>PeiYong Zhang</td>
+            <td>[Bug 7000] The URL is corrupted in UnixHTTPURLInputStream.cpp.
+            </td>
+        </tr>
+
+    </table>
+    </s2>
+
     <anchor name="Release170"/>
     <s2 title="Release Information of &XercesCName; 1.7.0: March 8, 2002">
     <table>
diff --git a/doc/releases_plan.xml b/doc/releases_plan.xml
index aa14947492fff6f392198fa4c84112f1b685ba78..4c06b487772dc01dfc90d1d716fe7ef6add9d01b 100644
--- a/doc/releases_plan.xml
+++ b/doc/releases_plan.xml
@@ -5,8 +5,8 @@
 
 <s2 title="&XercesCName; Future Releases Plan">
 <p>This document highlights the release plan for &XercesCName;.</p>
-<s3 title="Current Status"><p>&XercesCName; 2.0.0 - released on July 23, 2002.</p></s3>
-<s3 title="Next Target Release"><p>&XercesCName; 2.1.0 - plan to be released by the end of this year.</p></s3>
+<s3 title="Current Status"><p>&XercesCName; 2.1.0 - released on August 23, 2002.</p></s3>
+<s3 title="Next Target Release"><p>&XercesCName; 2.2.0 - plan to be released by the end of this year.</p></s3>
 <s3 title="&XercesCName; Features list">
 <p> The following table lists the TODO items for &XercesCName;.  It does not include fixing
 bugs that are opened in Bugzilla; unless such Bugzilla bug involves a major development