From be9a3664f432f7d8861e4f7300216e8bbf642c84 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Mon, 24 Apr 2006 10:47:56 +0000
Subject: [PATCH] Don't compile deprecated DOM
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@396510 13f79535-47bb-0310-9956-ffa450edef68
---
.../BCB6/Xerces-all/XercesLib/XercesLib.bpr | 123 +-----------------
.../MemHandlerTest/MemHandlerTest.mak | 9 +-
.../Win32/BCC.551/Xerces-all/Xerces-all.mak | 35 +++--
.../Xerces-all/XercesLib/XercesLib.mak | 72 +---------
Projects/Win32/VC6/xerces-all/xerces-all.dsw | 42 ------
.../Win32/VC7.1/xerces-all/xerces-all.sln | 30 -----
Projects/Win32/VC7/xerces-all/xerces-all.sln | 80 +++++-------
Projects/Win32/VC8/xerces-all/xerces-all.sln | 30 -----
scripts/sanityTest.pl | 6 -
scripts/sanityTest_ExpectedResult.log | 23 ----
tests/src/MemHandlerTest/MemoryMonitor.cpp | 15 ---
tests/src/MemHandlerTest/MemoryMonitor.hpp | 1 -
12 files changed, 55 insertions(+), 411 deletions(-)
diff --git a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
index b1b2a2499..9cb7799d5 100644
--- a/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
+++ b/Projects/Win32/BCB6/Xerces-all/XercesLib/XercesLib.bpr
@@ -275,64 +275,6 @@
..\..\..\..\..\Build\Win32\BCB6\obj\DOMTreeWalkerImpl.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMTypeInfoImpl.obj
..\..\..\..\..\Build\Win32\BCB6\obj\XSDElementNSImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\AttrImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\AttrMapImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\AttrNSImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\CDATASectionImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\CharacterDataImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ChildNode.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\CommentImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DeepNodeListImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DocumentFragmentImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DocumentImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DocumentTypeImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Attr.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_CDATASection.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_CharacterData.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Comment.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Document.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_DocumentFragment.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_DocumentType.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_DOMException.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_DOMImplementation.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Element.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Entity.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_EntityReference.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_NamedNodeMap.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Node.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_NodeFilter.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_NodeIterator.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_NodeList.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Notation.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_ProcessingInstruction.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Range.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_RangeException.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_Text.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_TreeWalker.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOM_XMLDecl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DomMemDebug.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOMParser.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DOMString.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\DStringPool.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ElementDefinitionImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ElementImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ElementNSImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\EntityImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\EntityReferenceImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NamedNodeMapImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NodeIDMap.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NodeImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NodeIteratorImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NodeListImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NodeVector.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\NotationImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ParentNode.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\ProcessingInstructionImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\RangeImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\RefCountedImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\TextImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\TreeWalkerImpl.obj
- ..\..\..\..\..\Build\Win32\BCB6\obj\XMLDeclImpl.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMException.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMRangeException.obj
..\..\..\..\..\Build\Win32\BCB6\obj\DOMXPathException.obj
@@ -369,7 +311,7 @@
<LIBRARIES value=""/>
<SPARELIBS value="rtl.lib"/>
<PACKAGES value="vcl.bpi rtl.bpi"/>
- <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom\deprecated;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi;"/>
+ <PATHCPP value=".;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework\psvi;"/>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
@@ -379,15 +321,14 @@
<USERDEFINES value="_DEBUG;PLATFORM_WIN32;XERCES_BUILDING_LIBRARY;XERCES_PATH_DELIMITER_BACKSLASH=1;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_USE_MSGLOADER_INMEMORY=1;HAVE_LIMITS_H=1;HAVE_FTIME=1;HAVE_SYS_TIMEB_H=1;HAVE_STRICMP=1;HAVE_STRNICMP=1"/>
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="Xerceslib.cpp"/>
- <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\deprecated;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;$(BCB)\include"/>
- <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\deprecated;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src;$(BCB)\include"/>
+ <LIBPATH value="..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par -w-8027 -w-8026"/>
<OTHERFILES value=""/>
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-I..\..\..\..\..\src\xercesc\framework\psvi
-I..\..\..\..\..\src\xercesc\dom
- -I..\..\..\..\..\src\xercesc\dom\deprecated
-I..\..\..\..\..\src\xercesc\dom\impl -I..\..\..\..\..\src\xercesc\sax2
-I..\..\..\..\..\src\xercesc\validators\schema
-I..\..\..\..\..\src\xercesc\validators\schema\identity
@@ -695,64 +636,6 @@
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMTreeWalkerImpl.cpp" FORMNAME="" UNITNAME="DOMTreeWalkerImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.cpp" FORMNAME="" UNITNAME="DOMTypeInfoImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\impl\XSDElementNSImpl.cpp" FORMNAME="" UNITNAME="XSDElementNSImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\AttrImpl.cpp" FORMNAME="" UNITNAME="AttrImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\AttrMapImpl.cpp" FORMNAME="" UNITNAME="AttrMapImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\AttrNSImpl.cpp" FORMNAME="" UNITNAME="AttrNSImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\CDATASectionImpl.cpp" FORMNAME="" UNITNAME="CDATASectionImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\CharacterDataImpl.cpp" FORMNAME="" UNITNAME="CharacterDataImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ChildNode.cpp" FORMNAME="" UNITNAME="ChildNode" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\CommentImpl.cpp" FORMNAME="" UNITNAME="CommentImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DeepNodeListImpl.cpp" FORMNAME="" UNITNAME="DeepNodeListImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DocumentFragmentImpl.cpp" FORMNAME="" UNITNAME="DocumentFragmentImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DocumentImpl.cpp" FORMNAME="" UNITNAME="DocumentImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DocumentTypeImpl.cpp" FORMNAME="" UNITNAME="DocumentTypeImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Attr.cpp" FORMNAME="" UNITNAME="DOM_Attr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_CDATASection.cpp" FORMNAME="" UNITNAME="DOM_CDATASection" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_CharacterData.cpp" FORMNAME="" UNITNAME="DOM_CharacterData" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Comment.cpp" FORMNAME="" UNITNAME="DOM_Comment" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Document.cpp" FORMNAME="" UNITNAME="DOM_Document" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_DocumentFragment.cpp" FORMNAME="" UNITNAME="DOM_DocumentFragment" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_DocumentType.cpp" FORMNAME="" UNITNAME="DOM_DocumentType" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_DOMException.cpp" FORMNAME="" UNITNAME="DOM_DOMException" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_DOMImplementation.cpp" FORMNAME="" UNITNAME="DOM_DOMImplementation" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Element.cpp" FORMNAME="" UNITNAME="DOM_Element" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Entity.cpp" FORMNAME="" UNITNAME="DOM_Entity" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_EntityReference.cpp" FORMNAME="" UNITNAME="DOM_EntityReference" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_NamedNodeMap.cpp" FORMNAME="" UNITNAME="DOM_NamedNodeMap" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Node.cpp" FORMNAME="" UNITNAME="DOM_Node" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_NodeFilter.cpp" FORMNAME="" UNITNAME="DOM_NodeFilter" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_NodeIterator.cpp" FORMNAME="" UNITNAME="DOM_NodeIterator" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_NodeList.cpp" FORMNAME="" UNITNAME="DOM_NodeList" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Notation.cpp" FORMNAME="" UNITNAME="DOM_Notation" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_ProcessingInstruction.cpp" FORMNAME="" UNITNAME="DOM_ProcessingInstruction" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Range.cpp" FORMNAME="" UNITNAME="DOM_Range" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_RangeException.cpp" FORMNAME="" UNITNAME="DOM_RangeException" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_Text.cpp" FORMNAME="" UNITNAME="DOM_Text" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_TreeWalker.cpp" FORMNAME="" UNITNAME="DOM_TreeWalker" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOM_XMLDecl.cpp" FORMNAME="" UNITNAME="DOM_XMLDecl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DomMemDebug.cpp" FORMNAME="" UNITNAME="DomMemDebug" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOMParser.cpp" FORMNAME="" UNITNAME="DOMParser" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DOMString.cpp" FORMNAME="" UNITNAME="DOMString" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\DStringPool.cpp" FORMNAME="" UNITNAME="DStringPool" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ElementDefinitionImpl.cpp" FORMNAME="" UNITNAME="ElementDefinitionImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ElementImpl.cpp" FORMNAME="" UNITNAME="ElementImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ElementNSImpl.cpp" FORMNAME="" UNITNAME="ElementNSImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\EntityImpl.cpp" FORMNAME="" UNITNAME="EntityImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\EntityReferenceImpl.cpp" FORMNAME="" UNITNAME="EntityReferenceImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NamedNodeMapImpl.cpp" FORMNAME="" UNITNAME="NamedNodeMapImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NodeIDMap.cpp" FORMNAME="" UNITNAME="NodeIDMap" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NodeImpl.cpp" FORMNAME="" UNITNAME="NodeImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NodeIteratorImpl.cpp" FORMNAME="" UNITNAME="NodeIteratorImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NodeListImpl.cpp" FORMNAME="" UNITNAME="NodeListImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NodeVector.cpp" FORMNAME="" UNITNAME="NodeVector" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\NotationImpl.cpp" FORMNAME="" UNITNAME="NotationImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ParentNode.cpp" FORMNAME="" UNITNAME="ParentNode" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\ProcessingInstructionImpl.cpp" FORMNAME="" UNITNAME="ProcessingInstructionImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\RangeImpl.cpp" FORMNAME="" UNITNAME="RangeImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\RefCountedImpl.cpp" FORMNAME="" UNITNAME="RefCountedImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\TextImpl.cpp" FORMNAME="" UNITNAME="TextImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\TreeWalkerImpl.cpp" FORMNAME="" UNITNAME="TreeWalkerImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\..\..\..\src\xercesc\dom\deprecated\XMLDeclImpl.cpp" FORMNAME="" UNITNAME="XMLDeclImpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\DOMException.cpp" FORMNAME="" UNITNAME="DOMException" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\DOMRangeException.cpp" FORMNAME="" UNITNAME="DOMRangeException" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\..\..\..\src\xercesc\dom\DOMXPathException.cpp" FORMNAME="" UNITNAME="DOMXPathException" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
diff --git a/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak b/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak
index 7e3a4f954..4d2f7328a 100755
--- a/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/MemHandlerTest/MemHandlerTest.mak
@@ -5,12 +5,7 @@ BCB = $(MAKEDIR)\..
# ---------------------------------------------------------------------------
TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551
PROJECT = $(TARGETPATH)\MemHandlerTest.exe
-!if $d(WITHDEPRDOM)
-DEPRDOM_OBJFILES = $(TARGETPATH)\obj\MemoryMonitor.obj $(TARGETPATH)\obj\SimpleHashPtr.obj
-!else
-NO_DEPRDOM_PRODUCEMAIN=NEVER_COMPILE
-!endif
-OBJFILES = $(DEPRDOM_OBJFILES) $(TARGETPATH)\obj\MemHandlerTest.obj
+OBJFILES = $(TARGETPATH)\obj\MemoryMonitor.obj $(TARGETPATH)\obj\SimpleHashPtr.obj $(TARGETPATH)\obj\MemHandlerTest.obj
RESFILES =
MAINSOURCE = MemHandlerTest.cpp
RESDEPEN = $(RESFILES)
@@ -25,7 +20,7 @@ PATHCPP = .;..\..\..\..\..\tests\src\MemHandlerTest
PATHASM = .;
PATHPAS = .;
PATHRC = .;
-USERDEFINES = _DEBUG;XERCES_NO_CONFIGURE_SUPPORT;WIN32_LEAN_AND_MEAN;$(NO_DEPRDOM_PRODUCEMAIN)
+USERDEFINES = _DEBUG;XERCES_NO_CONFIGURE_SUPPORT;WIN32_LEAN_AND_MEAN;
SYSDEFINES = _NO_VCL;NO_STRICT;_VIS_NOLIB;_RTLDLL
INCLUDEPATH = ..\..\..\..\..\tests\src\MemHandlerTest;..\..\..\..\..\src
LIBPATH =
diff --git a/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak b/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak
index de6f81000..dec9fc67f 100644
--- a/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/Xerces-all.mak
@@ -17,7 +17,7 @@ MAKEN = $(ROOT)\bin\$(MAKE) -$(MAKEFLAGS) -f
PROJECTNAMES = XercesLib DOMCount DOMPrint SAXCount SAXPrint SAX2Count SAX2Print \
DOMTest DOMMemTest DOMRangeTest DOMTraversal EncodingTest InitTermTest \
ThreadTest MemHandlerTest XSerializerTest PSVIWriter SCMPrint MemParse Redirect \
- StdInParse PParse EnumVal SEnumVal CreateDOMDocument XSValueTest DeprecatedDOMCount \
+ StdInParse PParse EnumVal SEnumVal CreateDOMDocument XSValueTest \
DOMTypeInfoTest
!include ..\..\..\..\version.incl
@@ -31,7 +31,7 @@ clearall:
XercesLib: XercesLib\XercesLib.mak
cd $<
copy ..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.borland.hpp ..\..\..\..\..\src\xercesc\util\Xerces_autoconf_config.hpp
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM) -DWITHASM=$(WITHASM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHASM=$(WITHASM)
cd ..
DOMPrint: DOMPrint\DOMPrint.mak
@@ -101,71 +101,66 @@ ThreadTest: ThreadTest\ThreadTest.mak
MemHandlerTest: MemHandlerTest\MemHandlerTest.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
XSerializerTest: XSerializerTest\XSerializerTest.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
PSVIWriter: PSVIWriter\PSVIWriter.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
SCMPrint: SCMPrint\SCMPrint.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
MemParse: MemParse\MemParse.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
Redirect: Redirect\Redirect.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
StdInParse: StdInParse\StdInParse.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
PParse: PParse\PParse.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
EnumVal: EnumVal\EnumVal.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
SEnumVal: SEnumVal\SEnumVal.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
CreateDOMDocument: CreateDOMDocument\CreateDOMDocument.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
XSValueTest: XSValueTest\XSValueTest.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
- cd ..
-
-DeprecatedDOMCount: DeprecatedDOMCount\DeprecatedDOMCount.mak
- cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
DOMTypeInfoTest: DOMTypeInfoTest\DOMTypeInfoTest.mak
cd $<
- $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER) -DWITHDEPRDOM=$(WITHDEPRDOM)
+ $(MAKEN) $<.mak -DXERCESVER=$(XERCESVER)
cd ..
diff --git a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
index 649970c62..e33da30a6 100644
--- a/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/BCC.551/Xerces-all/XercesLib/XercesLib.mak
@@ -6,69 +6,6 @@ BCB = $(MAKEDIR)\..
# ---------------------------------------------------------------------------
TARGETPATH=..\..\..\..\..\Build\Win32\BCC.551
PROJECT = $(TARGETPATH)\xerces-bor_$(XERCESVER).dll
-!if $d(WITHDEPRDOM)
-DEPRDOM_PATH=..\..\..\..\..\src\xercesc\dom\deprecated
-DEPRDOM_DEFINE=;PROJ_DEPRECATED_DOM
-DEPRDOM_OBJFILES = \
- $(TARGETPATH)\obj\AttrImpl.obj \
- $(TARGETPATH)\obj\AttrMapImpl.obj \
- $(TARGETPATH)\obj\AttrNSImpl.obj \
- $(TARGETPATH)\obj\CDATASectionImpl.obj \
- $(TARGETPATH)\obj\CharacterDataImpl.obj \
- $(TARGETPATH)\obj\ChildNode.obj \
- $(TARGETPATH)\obj\CommentImpl.obj \
- $(TARGETPATH)\obj\DeepNodeListImpl.obj \
- $(TARGETPATH)\obj\DocumentFragmentImpl.obj \
- $(TARGETPATH)\obj\DocumentImpl.obj \
- $(TARGETPATH)\obj\DocumentTypeImpl.obj \
- $(TARGETPATH)\obj\DomMemDebug.obj \
- $(TARGETPATH)\obj\DOMParser.obj \
- $(TARGETPATH)\obj\DOMString.obj \
- $(TARGETPATH)\obj\DOM_Attr.obj \
- $(TARGETPATH)\obj\DOM_CDATASection.obj \
- $(TARGETPATH)\obj\DOM_CharacterData.obj \
- $(TARGETPATH)\obj\DOM_Comment.obj \
- $(TARGETPATH)\obj\DOM_Document.obj \
- $(TARGETPATH)\obj\DOM_DocumentFragment.obj \
- $(TARGETPATH)\obj\DOM_DocumentType.obj \
- $(TARGETPATH)\obj\DOM_DOMException.obj \
- $(TARGETPATH)\obj\DOM_DOMImplementation.obj \
- $(TARGETPATH)\obj\DOM_Element.obj \
- $(TARGETPATH)\obj\DOM_Entity.obj \
- $(TARGETPATH)\obj\DOM_EntityReference.obj \
- $(TARGETPATH)\obj\DOM_NamedNodeMap.obj \
- $(TARGETPATH)\obj\DOM_Node.obj \
- $(TARGETPATH)\obj\DOM_NodeFilter.obj \
- $(TARGETPATH)\obj\DOM_NodeIterator.obj \
- $(TARGETPATH)\obj\DOM_NodeList.obj \
- $(TARGETPATH)\obj\DOM_Notation.obj \
- $(TARGETPATH)\obj\DOM_ProcessingInstruction.obj \
- $(TARGETPATH)\obj\DOM_Range.obj \
- $(TARGETPATH)\obj\DOM_RangeException.obj \
- $(TARGETPATH)\obj\DOM_Text.obj \
- $(TARGETPATH)\obj\DOM_TreeWalker.obj \
- $(TARGETPATH)\obj\DOM_XMLDecl.obj \
- $(TARGETPATH)\obj\DStringPool.obj \
- $(TARGETPATH)\obj\ElementDefinitionImpl.obj \
- $(TARGETPATH)\obj\ElementImpl.obj \
- $(TARGETPATH)\obj\ElementNSImpl.obj \
- $(TARGETPATH)\obj\EntityImpl.obj \
- $(TARGETPATH)\obj\EntityReferenceImpl.obj \
- $(TARGETPATH)\obj\NamedNodeMapImpl.obj \
- $(TARGETPATH)\obj\NodeIDMap.obj \
- $(TARGETPATH)\obj\NodeImpl.obj \
- $(TARGETPATH)\obj\NodeIteratorImpl.obj \
- $(TARGETPATH)\obj\NodeListImpl.obj \
- $(TARGETPATH)\obj\NodeVector.obj \
- $(TARGETPATH)\obj\NotationImpl.obj \
- $(TARGETPATH)\obj\ParentNode.obj \
- $(TARGETPATH)\obj\ProcessingInstructionImpl.obj \
- $(TARGETPATH)\obj\RangeImpl.obj \
- $(TARGETPATH)\obj\RefCountedImpl.obj \
- $(TARGETPATH)\obj\TextImpl.obj \
- $(TARGETPATH)\obj\TreeWalkerImpl.obj \
- $(TARGETPATH)\obj\XMLDeclImpl.obj
-!endif
OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
$(TARGETPATH)\obj\InMemMsgLoader.obj \
$(TARGETPATH)\obj\Win32TransService.obj \
@@ -368,7 +305,6 @@ OBJFILES = $(TARGETPATH)\obj\XercesLib.obj \
$(TARGETPATH)\obj\WindowsAtomicOpMgr.obj \
$(TARGETPATH)\obj\WindowsFileMgr.obj \
$(TARGETPATH)\obj\WindowsMutexMgr.obj \
- $(DEPRDOM_OBJFILES)
RESFILES =
MAINSOURCE = XercesLib.cpp
RESDEPEN = $(RESFILES)
@@ -379,17 +315,17 @@ LIBRARIES =
SPARELIBS =
DEFFILE =
# ---------------------------------------------------------------------------
-PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
+PATHCPP = .;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\dom\impl;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\AtomicOpManagers;..\..\..\..\..\src\xercesc\util\FileManagers;..\..\..\..\..\src\xercesc\util\MutexManagers;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
PATHASM = .;
PATHPAS = .;
PATHRC = .;..\..\..\..\..\src\xercesc\util\Platforms\Win32
!if !$d(WITHASM)
XERCES_NO_ASM=;XERCES_NO_ASM
!endif
-USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;$(DEPRDOM_DEFINE)$(XERCES_NO_ASM)
+USERDEFINES = _DEBUG;XERCES_BUILDING_LIBRARY;XERCES_USE_FILEMGR_WINDOWS=1;XERCES_USE_MUTEXMGR_WINDOWS=1;XERCES_USE_ATOMICOPMGR_WINDOWS=1;XERCES_USE_NETACCESSOR_WINSOCK=1;XERCES_USE_MSGLOADER_INMEMORY=1;XERCES_USE_TRANSCODER_WINDOWS=1;XERCES_PATH_DELIMITER_BACKSLASH=1;HAVE_LIMITS_H=1;HAVE_SYS_TIMEB_H=1;HAVE_FTIME=1;HAVE_STRICMP=1;HAVE_STRNICMP=1;$(XERCES_NO_ASM)
SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
-INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
-LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;$(DEPRDOM_PATH)
+INCLUDEPATH = ..\..\..\..\..\src;..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\framework\psvi;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
+LIBPATH = ..\..\..\..\..\src\xercesc\dom;..\..\..\..\..\src\xercesc\framework;..\..\..\..\..\src\xercesc\internal;..\..\..\..\..\src\xercesc\parsers;..\..\..\..\..\src\xercesc\sax;..\..\..\..\..\src\xercesc\sax2;..\..\..\..\..\src\xercesc\util;..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32;..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock;..\..\..\..\..\src\xercesc\util\regx;..\..\..\..\..\src\xercesc\util\Transcoders\Win32;..\..\..\..\..\src\xercesc\validators\common;..\..\..\..\..\src\xercesc\validators\datatype;..\..\..\..\..\src\xercesc\validators\DTD;..\..\..\..\..\src\xercesc\validators\schema;..\..\..\..\..\src\xercesc\validators\schema\identity;
WARNINGS= -w-par
# ---------------------------------------------------------------------------
CFLAG1 = -tWD -Od -Vx -Ve -X- -r- -a8 -4 -b -k -y -v -vi- -c -tWM
diff --git a/Projects/Win32/VC6/xerces-all/xerces-all.dsw b/Projects/Win32/VC6/xerces-all/xerces-all.dsw
index 61626382b..740638ceb 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-all.dsw
+++ b/Projects/Win32/VC6/xerces-all/xerces-all.dsw
@@ -123,24 +123,6 @@ Package=<4>
###############################################################################
-Project: "DeprecatedDOMCount"=".\DeprecatedDOMCount\DeprecatedDOMCount.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name XercesLib
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name XercesDeprecatedDOMLib
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "EncodingTest"=".\EncodingTest\EncodingTest.dsp" - Package Owner=<4>
Package=<5>
@@ -197,9 +179,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name XercesLib
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name XercesDeprecatedDOMLib
- End Project Dependency
}}}
###############################################################################
@@ -429,21 +408,6 @@ Package=<4>
###############################################################################
-Project: "XercesDeprecatedDOMLib"=".\XercesLib\XercesDeprecatedDOMLib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name XercesLib
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "XercesLib"=".\XercesLib\XercesLib.dsp" - Package Owner=<4>
Package=<5>
@@ -534,9 +498,6 @@ Package=<4>
Project_Dep_Name DOMTraversalTest
End Project Dependency
Begin Project Dependency
- Project_Dep_Name DeprecatedDOMCount
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name DOMTypeInfoTest
End Project Dependency
Begin Project Dependency
@@ -549,9 +510,6 @@ Package=<4>
Project_Dep_Name SCMPrint
End Project Dependency
Begin Project Dependency
- Project_Dep_Name XercesDeprecatedDOMLib
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name XSValueTest
End Project Dependency
Begin Project Dependency
diff --git a/Projects/Win32/VC7.1/xerces-all/xerces-all.sln b/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
index b04b4cd6a..78340fc6d 100644
--- a/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC7.1/xerces-all/xerces-all.sln
@@ -3,7 +3,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
ProjectSection(ProjectDependencies) = postProject
{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27} = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
{569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75} = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
{792C0625-DE93-4756-AAFA-23CCED2157B0} = {792C0625-DE93-4756-AAFA-23CCED2157B0}
{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F} = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2} = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
@@ -36,7 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
{B8B50FE7-B620-4D19-A147-B167D087DD53} = {B8B50FE7-B620-4D19-A147-B167D087DD53}
{15A10DF2-F551-4306-A4CC-690F58C58081} = {15A10DF2-F551-4306-A4CC-690F58C58081}
{895EDBF3-6A97-4641-8D96-7282005F8DD7} = {895EDBF3-6A97-4641-8D96-7282005F8DD7}
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C} = {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateDOMDocument", "CreateDOMDocument\CreateDOMDocument.vcproj", "{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}"
@@ -79,12 +77,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMTypeInfoTest", "DOMTypeI
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeprecatedDOMCount", "DeprecatedDOMCount\DeprecatedDOMCount.vcproj", "{57E8C0FF-3B2D-4322-A64D-5DE7893A667C}"
- ProjectSection(ProjectDependencies) = postProject
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
- {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EncodingTest", "EncodingTest\EncodingTest.vcproj", "{B8B50FE7-B620-4D19-A147-B167D087DD53}"
ProjectSection(ProjectDependencies) = postProject
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -102,7 +94,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InitTermTest", "InitTermTes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MemHandlerTest", "MemHandlerTest\MemHandlerTest.vcproj", "{160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}"
ProjectSection(ProjectDependencies) = postProject
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
@@ -185,11 +176,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMPrint", "SCMPrint\SCMPri
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesDeprecatedDOMLib", "XercesLib\XercesDeprecatedDOMLib.vcproj", "{E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}"
- ProjectSection(ProjectDependencies) = postProject
- {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSValueTest", "XSValueTest\XSValueTest.vcproj", "{D3552FBC-8618-43C5-86C0-237536D8E700}"
ProjectSection(ProjectDependencies) = postProject
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -278,14 +264,6 @@ Global
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Debug.Build.0 = Static Debug|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Release.ActiveCfg = Static Release|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Release.Build.0 = Static Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug.ActiveCfg = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug.Build.0 = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release.ActiveCfg = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release.Build.0 = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Debug.ActiveCfg = Static Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Debug.Build.0 = Static Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Release.ActiveCfg = Static Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Release.Build.0 = Static Release|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug.ActiveCfg = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug.Build.0 = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Release.ActiveCfg = Release|Win32
@@ -446,14 +424,6 @@ Global
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Debug.Build.0 = Static Debug|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Release.ActiveCfg = Static Release|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Release.Build.0 = Static Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug.ActiveCfg = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug.Build.0 = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release.ActiveCfg = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release.Build.0 = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Debug.ActiveCfg = Static Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Debug.Build.0 = Static Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Release.ActiveCfg = Static Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Release.Build.0 = Static Release|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug.ActiveCfg = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug.Build.0 = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Release.ActiveCfg = Release|Win32
diff --git a/Projects/Win32/VC7/xerces-all/xerces-all.sln b/Projects/Win32/VC7/xerces-all/xerces-all.sln
index 0d1f2a21a..17b8a6b2a 100644
--- a/Projects/Win32/VC7/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC7/xerces-all/xerces-all.sln
@@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMTraversalTest", "DOMTrav
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMTypeInfoTest", "DOMTypeInfoTest\DOMTypeInfoTest.vcproj", "{15A10DF2-F551-4306-A4CC-690F58C58081}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeprecatedDOMCount", "DeprecatedDOMCount\DeprecatedDOMCount.vcproj", "{57E8C0FF-3B2D-4322-A64D-5DE7893A667C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EncodingTest", "EncodingTest\EncodingTest.vcproj", "{B8B50FE7-B620-4D19-A147-B167D087DD53}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnumVal", "EnumVal\EnumVal.vcproj", "{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}"
@@ -59,8 +57,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSVIWriter", "PSVIWriter\PS
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMPrint", "SCMPrint\SCMPrint.vcproj", "{895EDBF3-6A97-4641-8D96-7282005F8DD7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesDeprecatedDOMLib", "XercesLib\XercesDeprecatedDOMLib.vcproj", "{E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSValueTest", "XSValueTest\XSValueTest.vcproj", "{D3552FBC-8618-43C5-86C0-237536D8E700}"
EndProject
Global
@@ -69,38 +65,36 @@ Global
ConfigName.1 = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.0 = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.1 = {2230D938-8908-4C12-9E96-9C6C4048A52D}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.2 = {895EDBF3-6A97-4641-8D96-7282005F8DD7}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.3 = {959445AC-9081-4590-B457-C96164CF4BFA}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.4 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.5 = {FB7E86DB-9557-4044-8FF7-A9131BB021E6}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.6 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.7 = {2AB767A9-6A3B-4993-8FDB-3E6A30560739}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.8 = {7259B5D2-54FE-4142-9321-0572C615F0A2}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.9 = {FB794093-CA26-4DBF-A7DF-1A62B7C872D5}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.10 = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.11 = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.12 = {65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.13 = {6F412978-851F-494D-8C3D-DF97A515EDF5}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.14 = {2682B2AB-E341-4528-85AB-BE95DE77A9BC}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.15 = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.16 = {B8B50FE7-B620-4D19-A147-B167D087DD53}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.17 = {15A10DF2-F551-4306-A4CC-690F58C58081}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.18 = {DFC196B9-2146-4CDA-AC0A-632BD38FA41D}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.19 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.20 = {056463A8-AEDD-4B92-BC24-C0C154C0379C}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.21 = {0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.22 = {60E3008A-0D78-4B25-A12E-9D7A3921F67C}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.23 = {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.24 = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.25 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.26 = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.27 = {D2D5D167-5DBC-4B68-9AF0-B7A9EBE86284}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.28 = {792C0625-DE93-4756-AAFA-23CCED2157B0}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.29 = {152CE948-F659-4206-A50A-1D2B9658EF96}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.30 = {D3552FBC-8618-43C5-86C0-237536D8E700}
- {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.31 = {4D8FEA60-A74F-4267-852F-C421AF12198D}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.0 = {2230D938-8908-4C12-9E96-9C6C4048A52D}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.1 = {895EDBF3-6A97-4641-8D96-7282005F8DD7}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.2 = {959445AC-9081-4590-B457-C96164CF4BFA}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.3 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.4 = {FB7E86DB-9557-4044-8FF7-A9131BB021E6}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.5 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.6 = {2AB767A9-6A3B-4993-8FDB-3E6A30560739}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.7 = {7259B5D2-54FE-4142-9321-0572C615F0A2}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.8 = {FB794093-CA26-4DBF-A7DF-1A62B7C872D5}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.9 = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.10 = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.11 = {65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.12 = {6F412978-851F-494D-8C3D-DF97A515EDF5}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.13 = {2682B2AB-E341-4528-85AB-BE95DE77A9BC}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.14 = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.15 = {B8B50FE7-B620-4D19-A147-B167D087DD53}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.16 = {15A10DF2-F551-4306-A4CC-690F58C58081}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.17 = {DFC196B9-2146-4CDA-AC0A-632BD38FA41D}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.18 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.19 = {056463A8-AEDD-4B92-BC24-C0C154C0379C}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.20 = {0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.21 = {60E3008A-0D78-4B25-A12E-9D7A3921F67C}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.22 = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.23 = {69220042-712E-41B5-A658-4CCF9D5B5FDF}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.24 = {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.25 = {D2D5D167-5DBC-4B68-9AF0-B7A9EBE86284}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.26 = {792C0625-DE93-4756-AAFA-23CCED2157B0}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.27 = {152CE948-F659-4206-A50A-1D2B9658EF96}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.28 = {D3552FBC-8618-43C5-86C0-237536D8E700}
+ {E305E46C-9D74-4755-BF57-29DEAEF4DCDD}.29 = {4D8FEA60-A74F-4267-852F-C421AF12198D}
{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{60E3008A-0D78-4B25-A12E-9D7A3921F67C}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{0D9CB6CF-DB0B-495D-B674-8FC3DD3C12C2}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -109,13 +103,10 @@ Global
{69220042-712E-41B5-A658-4CCF9D5B5FDF}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{DFC196B9-2146-4CDA-AC0A-632BD38FA41D}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{15A10DF2-F551-4306-A4CC-690F58C58081}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.1 = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
{B8B50FE7-B620-4D19-A147-B167D087DD53}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{2682B2AB-E341-4528-85AB-BE95DE77A9BC}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
- {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}.0 = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
- {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}.1 = {152CE948-F659-4206-A50A-1D2B9658EF96}
+ {160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{6F412978-851F-494D-8C3D-DF97A515EDF5}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{65BE6CCA-6F7F-4DB9-A6FD-C220E9FE87AD}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -131,7 +122,6 @@ Global
{4D8FEA60-A74F-4267-852F-C421AF12198D}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{FB7E86DB-9557-4044-8FF7-A9131BB021E6}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
{D3552FBC-8618-43C5-86C0-237536D8E700}.0 = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
@@ -171,10 +161,6 @@ Global
{15A10DF2-F551-4306-A4CC-690F58C58081}.Debug.Build.0 = Debug|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Release.ActiveCfg = Release|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Release.Build.0 = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug.ActiveCfg = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug.Build.0 = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release.ActiveCfg = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release.Build.0 = Release|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug.ActiveCfg = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug.Build.0 = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Release.ActiveCfg = Release|Win32
@@ -255,10 +241,6 @@ Global
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Debug.Build.0 = Debug|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Release.ActiveCfg = Release|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Release.Build.0 = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug.ActiveCfg = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug.Build.0 = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release.ActiveCfg = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release.Build.0 = Release|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug.ActiveCfg = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug.Build.0 = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Release.ActiveCfg = Release|Win32
diff --git a/Projects/Win32/VC8/xerces-all/xerces-all.sln b/Projects/Win32/VC8/xerces-all/xerces-all.sln
index ee545ba9f..148c35d96 100644
--- a/Projects/Win32/VC8/xerces-all/xerces-all.sln
+++ b/Projects/Win32/VC8/xerces-all/xerces-all.sln
@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
ProjectSection(ProjectDependencies) = postProject
{26A4FA00-DB6E-43FA-83D4-0FC3A5472A27} = {26A4FA00-DB6E-43FA-83D4-0FC3A5472A27}
{569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75} = {569D5A1E-C582-40B7-8BFC-FC7B5D4DDA75}
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
{792C0625-DE93-4756-AAFA-23CCED2157B0} = {792C0625-DE93-4756-AAFA-23CCED2157B0}
{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F} = {8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}
{BBD46C34-DEA0-42AB-96AB-E87C6371A6C2} = {BBD46C34-DEA0-42AB-96AB-E87C6371A6C2}
@@ -37,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all\all.vcproj", "{E
{B8B50FE7-B620-4D19-A147-B167D087DD53} = {B8B50FE7-B620-4D19-A147-B167D087DD53}
{15A10DF2-F551-4306-A4CC-690F58C58081} = {15A10DF2-F551-4306-A4CC-690F58C58081}
{895EDBF3-6A97-4641-8D96-7282005F8DD7} = {895EDBF3-6A97-4641-8D96-7282005F8DD7}
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C} = {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateDOMDocument", "CreateDOMDocument\CreateDOMDocument.vcproj", "{8709DC2A-0EC9-4B67-9E98-95D5174B2C3F}"
@@ -80,12 +78,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DOMTypeInfoTest", "DOMTypeI
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeprecatedDOMCount", "DeprecatedDOMCount\DeprecatedDOMCount.vcproj", "{57E8C0FF-3B2D-4322-A64D-5DE7893A667C}"
- ProjectSection(ProjectDependencies) = postProject
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
- {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EncodingTest", "EncodingTest\EncodingTest.vcproj", "{B8B50FE7-B620-4D19-A147-B167D087DD53}"
ProjectSection(ProjectDependencies) = postProject
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -103,7 +95,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InitTermTest", "InitTermTes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MemHandlerTest", "MemHandlerTest\MemHandlerTest.vcproj", "{160AC448-AD35-4FA9-8C4D-FF46A0E5BE5D}"
ProjectSection(ProjectDependencies) = postProject
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A} = {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
@@ -184,11 +175,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMPrint", "SCMPrint\SCMPri
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XercesDeprecatedDOMLib", "XercesLib\XercesDeprecatedDOMLib.vcproj", "{E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}"
- ProjectSection(ProjectDependencies) = postProject
- {152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSValueTest", "XSValueTest\XSValueTest.vcproj", "{D3552FBC-8618-43C5-86C0-237536D8E700}"
ProjectSection(ProjectDependencies) = postProject
{152CE948-F659-4206-A50A-1D2B9658EF96} = {152CE948-F659-4206-A50A-1D2B9658EF96}
@@ -270,14 +256,6 @@ Global
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Debug|Win32.Build.0 = Static Debug|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Release|Win32.ActiveCfg = Static Release|Win32
{15A10DF2-F551-4306-A4CC-690F58C58081}.Static Release|Win32.Build.0 = Static Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug|Win32.ActiveCfg = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Debug|Win32.Build.0 = Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release|Win32.ActiveCfg = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Release|Win32.Build.0 = Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Debug|Win32.Build.0 = Static Debug|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Release|Win32.ActiveCfg = Static Release|Win32
- {57E8C0FF-3B2D-4322-A64D-5DE7893A667C}.Static Release|Win32.Build.0 = Static Release|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug|Win32.ActiveCfg = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Debug|Win32.Build.0 = Debug|Win32
{B8B50FE7-B620-4D19-A147-B167D087DD53}.Release|Win32.ActiveCfg = Release|Win32
@@ -438,14 +416,6 @@ Global
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Debug|Win32.Build.0 = Static Debug|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Release|Win32.ActiveCfg = Static Release|Win32
{895EDBF3-6A97-4641-8D96-7282005F8DD7}.Static Release|Win32.Build.0 = Static Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug|Win32.ActiveCfg = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Debug|Win32.Build.0 = Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release|Win32.ActiveCfg = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Release|Win32.Build.0 = Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Debug|Win32.Build.0 = Static Debug|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Release|Win32.ActiveCfg = Static Release|Win32
- {E2D9921F-C2BE-47EE-B978-8C27A3D5EC9A}.Static Release|Win32.Build.0 = Static Release|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug|Win32.ActiveCfg = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Debug|Win32.Build.0 = Debug|Win32
{D3552FBC-8618-43C5-86C0-237536D8E700}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/scripts/sanityTest.pl b/scripts/sanityTest.pl
index 5f0a30193..d198f28b6 100644
--- a/scripts/sanityTest.pl
+++ b/scripts/sanityTest.pl
@@ -136,12 +136,6 @@ system ("RangeTest");
print ("DOMTraversalTest\n");
system ("DOMTraversalTest");
-# Run DeprecatedDOMCount
-system ("DeprecatedDOMCount");
-system ("DeprecatedDOMCount -v=never personal.xml");
-system ("DeprecatedDOMCount personal.xml");
-system ("DeprecatedDOMCount -n -s personal-schema.xml");
-
# Run XSerializerTest
system ("XSerializerTest");
system ("XSerializerTest -v=never personal.xml");
diff --git a/scripts/sanityTest_ExpectedResult.log b/scripts/sanityTest_ExpectedResult.log
index 0e96bebdd..d0a9c89bc 100644
--- a/scripts/sanityTest_ExpectedResult.log
+++ b/scripts/sanityTest_ExpectedResult.log
@@ -1096,27 +1096,6 @@ Test Run Successfully
DOMTraversalTest
Test Run Successfully
-Usage:
- DeprecatedDOMCount [options] <XML file | List file>
-
-This program invokes the DOM parser, builds the DOM tree,
-and then prints the number of elements found in each XML file.
-
-Options:
- -l Indicate the input file is a List File that has a list of xml files.
- Default to off (Input file is an XML file).
- -v=xxx Validation scheme [always | never | auto*].
- -n Enable namespace processing. Defaults to off.
- -s Enable schema processing. Defaults to off.
- -f Enable full schema constraint checking. Defaults to off.
- -? Show this help.
-
- * = Default if not provided explicitly.
-
-personal.xml:{timing removed}(37 elems).
-personal.xml:{timing removed}(37 elems).
-personal-schema.xml:{timing removed}(37 elems).
-
Usage:
XSerializerTest [options] <XML file | List file>
@@ -1219,12 +1198,10 @@ Options:
At destruction, domBuilderMemMonitor has 0 bytes.
At destruction, sax2MemMonitor has 0 bytes.
-At destruction, depDOMMemMonitor has 0 bytes.
At destruction, sax1MemMonitor has 0 bytes.
At destruction, staticMemMonitor has 0 bytes.
At destruction, domBuilderMemMonitor has 0 bytes.
At destruction, sax2MemMonitor has 0 bytes.
-At destruction, depDOMMemMonitor has 0 bytes.
At destruction, sax1MemMonitor has 0 bytes.
At destruction, staticMemMonitor has 0 bytes.
Test Run Successfully
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.cpp b/tests/src/MemHandlerTest/MemoryMonitor.cpp
index 27d49b8e0..8773125c5 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.cpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.cpp
@@ -265,11 +265,6 @@ int main (int argC, char *argV[])
SAXErrorHandler saxErrorHandler;
sax2parser->setErrorHandler(&saxErrorHandler);
- // Instantiate the deprecated DOM parser with its memory manager.
- MemoryMonitor *depDOMMemMonitor = new MemoryMonitor();
- DOMParser *depDOMParser = new (depDOMMemMonitor)DOMParser(0, depDOMMemMonitor);
- depDOMParser->setErrorHandler(&saxErrorHandler);
-
// Instantiate the SAX 1 parser with its memory manager.
MemoryMonitor *sax1MemMonitor = new MemoryMonitor();
SAXParser *saxParser = new (sax1MemMonitor) SAXParser(0, sax1MemMonitor);
@@ -278,17 +273,14 @@ int main (int argC, char *argV[])
// set features
domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMNamespaces, doNamespaces);
sax2parser->setFeature(XMLUni::fgSAX2CoreNameSpaces, doNamespaces);
- depDOMParser->setDoNamespaces(doNamespaces);
saxParser->setDoNamespaces(doNamespaces);
domBuilder->getDomConfig()->setParameter(XMLUni::fgXercesSchema, doSchema);
sax2parser->setFeature(XMLUni::fgXercesSchema, doSchema);
- depDOMParser->setDoSchema(doSchema);
saxParser->setDoSchema(doSchema);
domBuilder->getDomConfig()->setParameter(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
sax2parser->setFeature(XMLUni::fgXercesSchemaFullChecking, schemaFullChecking);
- depDOMParser->setValidationSchemaFullChecking(schemaFullChecking);
saxParser->setValidationSchemaFullChecking(schemaFullChecking);
if (domBuilderValScheme == AbstractDOMParser::Val_Auto)
@@ -296,14 +288,12 @@ int main (int argC, char *argV[])
domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidateIfSchema, true);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, true);
sax2parser->setFeature(XMLUni::fgXercesDynamic, true);
- depDOMParser->setValidationScheme(DOMParser::Val_Auto);
saxParser->setValidationScheme(SAXParser::Val_Auto);
}
else if (domBuilderValScheme == AbstractDOMParser::Val_Never)
{
domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidate, false);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, false);
- depDOMParser->setValidationScheme(DOMParser::Val_Never);
saxParser->setValidationScheme(SAXParser::Val_Never);
}
else if (domBuilderValScheme == AbstractDOMParser::Val_Always)
@@ -311,7 +301,6 @@ int main (int argC, char *argV[])
domBuilder->getDomConfig()->setParameter(XMLUni::fgDOMValidate, true);
sax2parser->setFeature(XMLUni::fgSAX2CoreValidation, true);
sax2parser->setFeature(XMLUni::fgXercesDynamic, false);
- depDOMParser->setValidationScheme(DOMParser::Val_Always);
saxParser->setValidationScheme(SAXParser::Val_Always);
}
@@ -367,7 +356,6 @@ int main (int argC, char *argV[])
doc = domBuilder->parseURI(xmlFile);
sax2parser->parse(xmlFile);
- depDOMParser->parse(xmlFile);
saxParser->parse(xmlFile);
}
catch (const OutOfMemoryException&)
@@ -414,16 +402,13 @@ int main (int argC, char *argV[])
//
domBuilder->release();
delete sax2parser;
- delete depDOMParser;
delete saxParser;
XERCES_STD_QUALIFIER cout << "At destruction, domBuilderMemMonitor has " << domBuilderMemMonitor->getTotalMemory() << " bytes." << XERCES_STD_QUALIFIER endl;
XERCES_STD_QUALIFIER cout << "At destruction, sax2MemMonitor has " << sax2MemMonitor->getTotalMemory() << " bytes." << XERCES_STD_QUALIFIER endl;
- XERCES_STD_QUALIFIER cout << "At destruction, depDOMMemMonitor has " << depDOMMemMonitor->getTotalMemory() << " bytes." << XERCES_STD_QUALIFIER endl;
XERCES_STD_QUALIFIER cout << "At destruction, sax1MemMonitor has " << sax1MemMonitor->getTotalMemory() << " bytes." << XERCES_STD_QUALIFIER endl;
delete domBuilderMemMonitor;
delete sax2MemMonitor;
- delete depDOMMemMonitor;
delete sax1MemMonitor;
XMLPlatformUtils::Terminate();
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.hpp b/tests/src/MemHandlerTest/MemoryMonitor.hpp
index 2e9c2baef..3ae46993b 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.hpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.hpp
@@ -33,7 +33,6 @@
#include <xercesc/sax2/SAX2XMLReader.hpp>
#include <xercesc/sax/ErrorHandler.hpp>
#include <xercesc/sax/SAXParseException.hpp>
-#include <xercesc/dom/deprecated/DOMParser.hpp>
#include <xercesc/parsers/SAXParser.hpp>
#include "SimpleValueHashTableOf.hpp"
--
GitLab