Changeset 2733 for icXML


Ignore:
Timestamp:
Dec 4, 2012, 1:59:02 PM (6 years ago)
Author:
cameron
Message:

More path fixes.

Location:
icXML/icXML-devel
Files:
1 added
68 edited

Legend:

Unmodified
Added
Removed
  • icXML/icXML-devel/samples/src/CreateDOMDocument/CreateDOMDocument.cpp

    r2726 r2733  
    2929//  Includes
    3030// ---------------------------------------------------------------------------
    31 #include <xercesc/util/PlatformUtils.hpp>
    32 #include <xercesc/util/XMLString.hpp>
     31#include <icxercesc/util/PlatformUtils.hpp>
     32#include <icxercesc/util/XMLString.hpp>
    3333#include <xercesc/dom/DOM.hpp>
    3434#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/DOMCount/DOMCount.cpp

    r2726 r2733  
    2323//  Includes
    2424// ---------------------------------------------------------------------------
    25 #include <xercesc/util/PlatformUtils.hpp>
    26 #include <xercesc/parsers/AbstractDOMParser.hpp>
     25#include <icxercesc/util/PlatformUtils.hpp>
     26#include <icxercesc/parsers/AbstractDOMParser.hpp>
    2727#include <xercesc/dom/DOMImplementation.hpp>
    2828#include <xercesc/dom/DOMImplementationLS.hpp>
  • icXML/icXML-devel/samples/src/DOMCount/DOMCount.hpp

    r2726 r2733  
    2424// ---------------------------------------------------------------------------
    2525#include <xercesc/dom/DOMErrorHandler.hpp>
    26 #include <xercesc/util/XMLString.hpp>
     26#include <icxercesc/util/XMLString.hpp>
    2727#if defined(XERCES_NEW_IOSTREAMS)
    2828#include <iostream>
  • icXML/icXML-devel/samples/src/DOMPrint/DOMPrint.cpp

    r2726 r2733  
    6767//  Includes
    6868// ---------------------------------------------------------------------------
    69 #include <xercesc/util/PlatformUtils.hpp>
     69#include <icxercesc/util/PlatformUtils.hpp>
    7070
    7171#include <xercesc/dom/DOM.hpp>
  • icXML/icXML-devel/samples/src/DOMPrint/DOMPrintErrorHandler.cpp

    r2726 r2733  
    2020 */
    2121
    22 #include <xercesc/util/XMLString.hpp>
     22#include <icxercesc/util/XMLString.hpp>
    2323#include <xercesc/dom/DOMError.hpp>
    2424#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/samples/src/DOMPrint/DOMPrintFilter.cpp

    r2726 r2733  
    2222#include "DOMPrintFilter.hpp"
    2323#include <xercesc/util/XMLUniDefs.hpp>
    24 #include <xercesc/util/XMLString.hpp>
     24#include <icxercesc/util/XMLString.hpp>
    2525
    2626static const XMLCh  element_person[]=
  • icXML/icXML-devel/samples/src/EnumVal/EnumVal.cpp

    r2726 r2733  
    2424// ---------------------------------------------------------------------------
    2525#include <xercesc/util/NameIdPool.hpp>
    26 #include <xercesc/util/PlatformUtils.hpp>
    27 #include <xercesc/framework/XMLValidator.hpp>
    28 #include <xercesc/parsers/SAXParser.hpp>
    29 #include <xercesc/validators/DTD/DTDValidator.hpp>
     26#include <icxercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/framework/XMLValidator.hpp>
     28#include <icxercesc/parsers/SAXParser.hpp>
     29#include <icxercesc/validators/DTD/DTDValidator.hpp>
    3030#include <xercesc/util/OutOfMemoryException.hpp>   
    3131#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/samples/src/MemParse/MemParse.cpp

    r2726 r2733  
    3636//  Includes
    3737// ---------------------------------------------------------------------------
    38 #include <xercesc/parsers/SAXParser.hpp>
     38#include <icxercesc/parsers/SAXParser.hpp>
    3939#include <xercesc/framework/MemBufInputSource.hpp>
    4040#include "MemParse.hpp"
  • icXML/icXML-devel/samples/src/MemParse/MemParse.hpp

    r2726 r2733  
    2626#include <string.h>
    2727#include <stdlib.h>
    28 #include <xercesc/util/PlatformUtils.hpp>
     28#include <icxercesc/util/PlatformUtils.hpp>
    2929#include "MemParseHandlers.hpp"
    3030
  • icXML/icXML-devel/samples/src/MemParse/MemParseHandlers.hpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/sax/HandlerBase.hpp>
     26#include <icxercesc/sax/HandlerBase.hpp>
    2727
    2828XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/PParse/PParse.cpp

    r2726 r2733  
    4646//  Includes
    4747// ---------------------------------------------------------------------------
    48 #include <xercesc/util/PlatformUtils.hpp>
     48#include <icxercesc/util/PlatformUtils.hpp>
    4949#include <xercesc/framework/XMLPScanToken.hpp>
    50 #include <xercesc/parsers/SAXParser.hpp>
     50#include <icxercesc/parsers/SAXParser.hpp>
    5151#include "PParse.hpp"
    5252#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/PParse/PParseHandlers.hpp

    r2726 r2733  
    2121
    2222
    23 #include    <xercesc/sax/HandlerBase.hpp>
     23#include    <icxercesc/sax/HandlerBase.hpp>
    2424
    2525XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/PSVIWriter/PSVIWriter.cpp

    r2726 r2733  
    2828#include <xercesc/framework/StdOutFormatTarget.hpp>
    2929#include <xercesc/framework/LocalFileFormatTarget.hpp>
    30 #include <xercesc/util/PlatformUtils.hpp>
    31 #include <xercesc/util/TransService.hpp>
    32 #include <xercesc/util/XMLString.hpp>
    33 #include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
     30#include <icxercesc/util/PlatformUtils.hpp>
     31#include <icxercesc/util/TransService.hpp>
     32#include <icxercesc/util/XMLString.hpp>
     33#include <icxercesc/parsers/SAX2XMLReaderImpl.hpp>
    3434#include <xercesc/sax2/XMLReaderFactory.hpp>
    3535#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/PSVIWriter/PSVIWriter.hpp

    r2726 r2733  
    2727#include <stdlib.h>
    2828#include <string.h>
    29 #include <xercesc/util/PlatformUtils.hpp>
     29#include <icxercesc/util/PlatformUtils.hpp>
    3030#include <xercesc/util/XMLUni.hpp>
    3131#include <xercesc/sax2/XMLReaderFactory.hpp>
  • icXML/icXML-devel/samples/src/PSVIWriter/PSVIWriterHandlers.cpp

    r2726 r2733  
    2323#include <xercesc/util/XMLUni.hpp>
    2424#include <xercesc/util/XMLUniDefs.hpp>
    25 #include <xercesc/util/XMLString.hpp>
     25#include <icxercesc/util/XMLString.hpp>
    2626#include <xercesc/sax/SAXParseException.hpp>
    2727#include <xercesc/sax/SAXException.hpp>
  • icXML/icXML-devel/samples/src/PSVIWriter/PSVIWriterHandlers.hpp

    r2726 r2733  
    2323// ---------------------------------------------------------------------------
    2424#include <xercesc/sax2/Attributes.hpp>
    25 #include <xercesc/sax2/DefaultHandler.hpp>
     25#include <icxercesc/sax2/DefaultHandler.hpp>
    2626#include <xercesc/framework/psvi/XSConstants.hpp>
    2727#include <xercesc/framework/psvi/PSVIHandler.hpp>
  • icXML/icXML-devel/samples/src/Redirect/Redirect.cpp

    r2726 r2733  
    4343//  Includes
    4444// ---------------------------------------------------------------------------
    45 #include <xercesc/parsers/SAXParser.hpp>
     45#include <icxercesc/parsers/SAXParser.hpp>
    4646#include "Redirect.hpp"
    4747#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/Redirect/Redirect.hpp

    r2726 r2733  
    3131#include <iostream.h>
    3232#endif
    33 #include <xercesc/util/PlatformUtils.hpp>
     33#include <icxercesc/util/PlatformUtils.hpp>
    3434#include "RedirectHandlers.hpp"
    3535
  • icXML/icXML-devel/samples/src/Redirect/RedirectHandlers.hpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/sax/HandlerBase.hpp>
     26#include <icxercesc/sax/HandlerBase.hpp>
    2727#include <xercesc/util/XMLEntityResolver.hpp>
    2828
  • icXML/icXML-devel/samples/src/SAX2Count/SAX2Count.cpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include "SAX2Count.hpp"
    27 #include <xercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/util/PlatformUtils.hpp>
    2828#include <xercesc/sax2/SAX2XMLReader.hpp>
    2929#include <xercesc/sax2/XMLReaderFactory.hpp>
  • icXML/icXML-devel/samples/src/SAX2Count/SAX2Count.hpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626
    27 #include <xercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/util/PlatformUtils.hpp>
    2828#include <stdlib.h>
    2929#include <string.h>
  • icXML/icXML-devel/samples/src/SAX2Count/SAX2CountHandlers.hpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include <xercesc/sax2/Attributes.hpp>
    27 #include <xercesc/sax2/DefaultHandler.hpp>
     27#include <icxercesc/sax2/DefaultHandler.hpp>
    2828
    2929XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/SAX2Print/SAX2Print.cpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/util/PlatformUtils.hpp>
    27 #include <xercesc/util/TransService.hpp>
     26#include <icxercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/util/TransService.hpp>
    2828#include <xercesc/sax2/SAX2XMLReader.hpp>
    2929#include <xercesc/sax2/XMLReaderFactory.hpp>
  • icXML/icXML-devel/samples/src/SAX2Print/SAX2PrintHandlers.hpp

    r2726 r2733  
    2020 */
    2121
    22 #include    <xercesc/sax2/DefaultHandler.hpp>
     22#include    <icxercesc/sax2/DefaultHandler.hpp>
    2323#include    <xercesc/framework/XMLFormatter.hpp>
    2424
  • icXML/icXML-devel/samples/src/SAXCount/SAXCount.hpp

    r2726 r2733  
    2424//  Includes for all the program files to see
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/util/PlatformUtils.hpp>
     26#include <icxercesc/util/PlatformUtils.hpp>
    2727#include <stdlib.h>
    2828#include <string.h>
     
    3232#include <iostream.h>
    3333#endif
    34 #include <xercesc/parsers/SAXParser.hpp>
     34#include <icxercesc/parsers/SAXParser.hpp>
    3535#include "SAXCountHandlers.hpp"
    3636
  • icXML/icXML-devel/samples/src/SAXCount/SAXCountHandlers.hpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/sax/HandlerBase.hpp>
     26#include <icxercesc/sax/HandlerBase.hpp>
    2727
    2828XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/SAXPrint/SAXPrint.cpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/util/PlatformUtils.hpp>
    27 #include <xercesc/util/TransService.hpp>
    28 #include <xercesc/parsers/SAXParser.hpp>
     26#include <icxercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/util/TransService.hpp>
     28#include <icxercesc/parsers/SAXParser.hpp>
    2929#include "SAXPrint.hpp"
    3030#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/SAXPrint/SAXPrintHandlers.hpp

    r2726 r2733  
    2121
    2222
    23 #include    <xercesc/sax/HandlerBase.hpp>
     23#include    <icxercesc/sax/HandlerBase.hpp>
    2424#include    <xercesc/framework/XMLFormatter.hpp>
    2525
  • icXML/icXML-devel/samples/src/SCMPrint/SCMPrint.cpp

    r2726 r2733  
    2323//  Includes
    2424// ---------------------------------------------------------------------------
    25 #include <xercesc/util/PlatformUtils.hpp>
     25#include <icxercesc/util/PlatformUtils.hpp>
    2626#include <xercesc/sax2/SAX2XMLReader.hpp>
    2727#include <xercesc/sax2/XMLReaderFactory.hpp>
    28 #include <xercesc/framework/XMLGrammarPoolImpl.hpp>
     28#include <icxercesc/framework/XMLGrammarPoolImpl.hpp>
    2929#include <xercesc/framework/psvi/XSModel.hpp>
    3030#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
     
    4444#include <string.h>
    4545#include <xercesc/util/OutOfMemoryException.hpp>
    46 #include <xercesc/sax2/DefaultHandler.hpp>
     46#include <icxercesc/sax2/DefaultHandler.hpp>
    4747
    4848XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/SEnumVal/SEnumVal.cpp

    r2726 r2733  
    2323// ---------------------------------------------------------------------------
    2424#include <xercesc/util/NameIdPool.hpp>
    25 #include <xercesc/util/PlatformUtils.hpp>
    26 #include <xercesc/framework/XMLValidator.hpp>
     25#include <icxercesc/util/PlatformUtils.hpp>
     26#include <icxercesc/framework/XMLValidator.hpp>
    2727#include <xercesc/framework/psvi/XSAnnotation.hpp>
    28 #include <xercesc/parsers/SAXParser.hpp>
     28#include <icxercesc/parsers/SAXParser.hpp>
    2929#include <xercesc/validators/schema/SchemaValidator.hpp>
    30 #include <xercesc/validators/schema/SchemaSymbols.hpp>
     30#include <icxercesc/validators/schema/SchemaSymbols.hpp>
    3131#include <xercesc/validators/common/ContentSpecNode.hpp>
    3232#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/StdInParse/StdInParse.cpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include <xercesc/framework/StdInInputSource.hpp>
    27 #include <xercesc/parsers/SAXParser.hpp>
     27#include <icxercesc/parsers/SAXParser.hpp>
    2828#include "StdInParse.hpp"
    2929#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/samples/src/StdInParse/StdInParse.hpp

    r2726 r2733  
    3131#include <iostream.h>
    3232#endif
    33 #include <xercesc/util/PlatformUtils.hpp>
     33#include <icxercesc/util/PlatformUtils.hpp>
    3434#include "StdInParseHandlers.hpp"
    3535
  • icXML/icXML-devel/samples/src/StdInParse/StdInParseHandlers.hpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include <xercesc/sax/HandlerBase.hpp>
     26#include <icxercesc/sax/HandlerBase.hpp>
    2727
    2828XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/samples/src/XInclude/XInclude.cpp

    r2726 r2733  
    2323//  Includes
    2424// ---------------------------------------------------------------------------
    25 #include <xercesc/util/PlatformUtils.hpp>
    26 #include <xercesc/parsers/AbstractDOMParser.hpp>
     25#include <icxercesc/util/PlatformUtils.hpp>
     26#include <icxercesc/parsers/AbstractDOMParser.hpp>
    2727#include <xercesc/framework/LocalFileFormatTarget.hpp>
    2828#include <xercesc/dom/DOMDocument.hpp>
    2929#include <xercesc/dom/DOM.hpp>
    30 #include <xercesc/util/XMLString.hpp>
     30#include <icxercesc/util/XMLString.hpp>
    3131
    3232#include "XInclude.hpp"
  • icXML/icXML-devel/samples/src/XInclude/XInclude.hpp

    r2726 r2733  
    2424// ---------------------------------------------------------------------------
    2525#include <xercesc/dom/DOMErrorHandler.hpp>
    26 #include <xercesc/util/XMLString.hpp>
     26#include <icxercesc/util/XMLString.hpp>
    2727
    2828#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/scripts/fix_icxml_imports.py

    r2727 r2733  
    2626        return overrides
    2727
    28 xercesc_include_RE = re.compile("#include <xercesc/([^>]*)>")
     28xercesc_include_RE = re.compile(r"(#\s*include\s+)<xercesc/([^>]*)>")
    2929
    30 xercesc_makefile_RE = re.compile("(\s)xercesc/([^\s]*)(\s)")
     30xercesc_makefile_RE = re.compile("(\\s)xercesc/([^\\s]*)(\\s)")
    3131
    3232
    3333def fix1_path_in_source(matchobj):
    34         if matchobj.group(1) in override_set:
    35           return "#include <%s/%s>" % (icxml_override_dir, matchobj.group(1))
     34        if matchobj.group(2) in override_set:
     35          return "%s<%s/%s>" % (matchobj.group(1), icxml_override_dir, matchobj.group(2))
    3636        else: return matchobj.group(0)
    3737
     
    5151        return s
    5252
    53 makefile = re.compile("Makefile.am|Makefile.in|Makefile$")
     53makefile = re.compile("Makefile.am$|Makefile.in$|Makefile$")
    5454
    5555def fix_file(path):
  • icXML/icXML-devel/src/xercesc/sax/InputSource.cpp

    r2722 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include    <xercesc/sax/InputSource.hpp>
    27 #include    <xercesc/util/XMLString.hpp>
     27#include    <icxercesc/util/XMLString.hpp>
    2828
    2929XERCES_CPP_NAMESPACE_BEGIN
  • icXML/icXML-devel/src/xercesc/sax/SAXParseException.cpp

    r2722 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include    <xercesc/util/XMLString.hpp>
     26#include    <icxercesc/util/XMLString.hpp>
    2727#include    <xercesc/sax/Locator.hpp>
    2828#include    <xercesc/sax/SAXParseException.hpp>
  • icXML/icXML-devel/src/xercesc/util/PlatformUtils.cpp

    r2722 r2733  
    111111#endif
    112112#if XERCES_USE_TRANSCODER_GNUICONV
    113 #       include <xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp>
     113#       include <icxercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp>
    114114#endif
    115115#if XERCES_USE_TRANSCODER_ICONV
  • icXML/icXML-devel/tests/src/DOM/DOMMemTest/DOMMemTest.cpp

    r2726 r2733  
    2828#include <string.h>
    2929#include <xercesc/dom/DOM.hpp>
    30 #include <xercesc/util/PlatformUtils.hpp>
     30#include <icxercesc/util/PlatformUtils.hpp>
    3131#include <xercesc/util/XMLException.hpp>
    32 #include <xercesc/util/XMLString.hpp>
     32#include <icxercesc/util/XMLString.hpp>
    3333#include <xercesc/util/XMLUniDefs.hpp>
    3434
  • icXML/icXML-devel/tests/src/DOM/DOMTest/DTest.cpp

    r2726 r2733  
    3030#include <stdio.h>
    3131#include "DTest.h"
    32 #include <xercesc/util/PlatformUtils.hpp>
     32#include <icxercesc/util/PlatformUtils.hpp>
    3333#include <xercesc/util/XMLException.hpp>
    34 #include <xercesc/util/XMLString.hpp>
     34#include <icxercesc/util/XMLString.hpp>
    3535#include <xercesc/util/BinInputStream.hpp>
    3636#include <xercesc/parsers/XercesDOMParser.hpp>
     
    4040#include <xercesc/util/OutOfMemoryException.hpp>
    4141#include <xercesc/framework/MemBufInputSource.hpp>
    42 #include <xercesc/validators/common/CMStateSet.hpp>
     42#include <icxercesc/validators/common/CMStateSet.hpp>
    4343
    4444#define UNUSED(x) { if(x!=0){} }
  • icXML/icXML-devel/tests/src/DOM/Normalizer/Normalizer.cpp

    r2726 r2733  
    1717
    1818#include "Normalizer.hpp"
    19 #include <xercesc/util/PlatformUtils.hpp>
     19#include <icxercesc/util/PlatformUtils.hpp>
    2020#include <xercesc/framework/StdOutFormatTarget.hpp>
    21 #include <xercesc/framework/XMLBuffer.hpp>
     21#include <icxercesc/framework/XMLBuffer.hpp>
    2222#include <xercesc/parsers/XercesDOMParser.hpp>
    2323
  • icXML/icXML-devel/tests/src/DOM/RangeTest/RangeTest.cpp

    r2726 r2733  
    3131#include <stdio.h>
    3232#include <xercesc/dom/DOM.hpp>
    33 #include <xercesc/util/PlatformUtils.hpp>
     33#include <icxercesc/util/PlatformUtils.hpp>
    3434#include <xercesc/util/XMLException.hpp>
    35 #include <xercesc/util/XMLString.hpp>
     35#include <icxercesc/util/XMLString.hpp>
    3636#include <xercesc/util/XMLUni.hpp>
    3737#include <xercesc/util/XMLUniDefs.hpp>
  • icXML/icXML-devel/tests/src/DOM/Traversal/Traversal.cpp

    r2726 r2733  
    3333#include <string.h>
    3434#include <xercesc/dom/DOM.hpp>
    35 #include <xercesc/util/PlatformUtils.hpp>
     35#include <icxercesc/util/PlatformUtils.hpp>
    3636#include <xercesc/util/XMLException.hpp>
    37 #include <xercesc/util/XMLString.hpp>
     37#include <icxercesc/util/XMLString.hpp>
    3838#include <xercesc/util/XMLUniDefs.hpp>
    3939
  • icXML/icXML-devel/tests/src/DOM/TypeInfo/TypeInfo.cpp

    r2726 r2733  
    1818#include "TypeInfo.hpp"
    1919
    20 #include <xercesc/util/PlatformUtils.hpp>
     20#include <icxercesc/util/PlatformUtils.hpp>
    2121#include <xercesc/util/XMLException.hpp>
    22 #include <xercesc/util/XMLString.hpp>
     22#include <icxercesc/util/XMLString.hpp>
    2323#include <xercesc/parsers/XercesDOMParser.hpp>
    2424#include <xercesc/dom/DOMException.hpp>
    2525#include <xercesc/dom/DOM.hpp>
    26 #include <xercesc/validators/schema/SchemaSymbols.hpp>
     26#include <icxercesc/validators/schema/SchemaSymbols.hpp>
    2727
    2828#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/tests/src/EncodingTest/EncodingTest.cpp

    r2726 r2733  
    2727//  Includes
    2828// ---------------------------------------------------------------------------
    29 #include <xercesc/framework/XMLBuffer.hpp>
    30 #include <xercesc/util/PlatformUtils.hpp>
    31 #include <xercesc/util/XMLString.hpp>
     29#include <icxercesc/framework/XMLBuffer.hpp>
     30#include <icxercesc/util/PlatformUtils.hpp>
     31#include <icxercesc/util/XMLString.hpp>
    3232#include <xercesc/util/XMLException.hpp>
    3333
  • icXML/icXML-devel/tests/src/InitTermTest/InitTermTest.cpp

    r2726 r2733  
    2828//  Includes
    2929// ---------------------------------------------------------------------------
    30 #include <xercesc/util/PlatformUtils.hpp>
     30#include <icxercesc/util/PlatformUtils.hpp>
    3131#include <xercesc/sax/SAXException.hpp>
    3232#include <xercesc/sax/SAXParseException.hpp>
    3333
    3434#include <xercesc/parsers/XercesDOMParser.hpp>
    35 #include <xercesc/parsers/SAXParser.hpp>
     35#include <icxercesc/parsers/SAXParser.hpp>
    3636#include <xercesc/sax2/SAX2XMLReader.hpp>
    3737#include <xercesc/sax2/XMLReaderFactory.hpp>
  • icXML/icXML-devel/tests/src/InitTermTest/InitTermTest.hpp

    r2726 r2733  
    2424// ---------------------------------------------------------------------------
    2525#include <xercesc/sax/ErrorHandler.hpp>
    26 #include <xercesc/util/PlatformUtils.hpp>
     26#include <icxercesc/util/PlatformUtils.hpp>
    2727
    2828#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/tests/src/MemHandlerTest/MemoryMonitor.hpp

    r2726 r2733  
    2222
    2323#include <xercesc/framework/MemoryManager.hpp>
    24 #include <xercesc/util/PlatformUtils.hpp>
     24#include <icxercesc/util/PlatformUtils.hpp>
    2525#include <xercesc/dom/DOMLSParser.hpp>
    2626#include <xercesc/dom/DOMErrorHandler.hpp>
     
    2929#include <xercesc/dom/DOMImplementationLS.hpp>
    3030#include <xercesc/dom/DOMImplementationRegistry.hpp>
    31 #include <xercesc/parsers/AbstractDOMParser.hpp>
     31#include <icxercesc/parsers/AbstractDOMParser.hpp>
    3232#include <xercesc/sax2/XMLReaderFactory.hpp>
    3333#include <xercesc/sax2/SAX2XMLReader.hpp>
    3434#include <xercesc/sax/ErrorHandler.hpp>
    3535#include <xercesc/sax/SAXParseException.hpp>
    36 #include <xercesc/parsers/SAXParser.hpp>
     36#include <icxercesc/parsers/SAXParser.hpp>
    3737#include "SimpleValueHashTableOf.hpp"
    3838
  • icXML/icXML-devel/tests/src/MemHandlerTest/SimpleValueHashTableOf.hpp

    r2726 r2733  
    3333#include <xercesc/util/XMLExceptMsgs.hpp>
    3434#include <xercesc/util/XMLEnumerator.hpp>
    35 #include <xercesc/util/Hashers.hpp>
     35#include <icxercesc/util/Hashers.hpp>
    3636
    3737XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/tests/src/NetAccessorTest/NetAccessorTest.cpp

    r2726 r2733  
    2525//  Includes
    2626// ---------------------------------------------------------------------------
    27 #include    <xercesc/util/PlatformUtils.hpp>
    28 #include    <xercesc/util/XMLString.hpp>
     27#include    <icxercesc/util/PlatformUtils.hpp>
     28#include    <icxercesc/util/XMLString.hpp>
    2929#include    <xercesc/util/XMLURL.hpp>
    3030#include    <xercesc/util/XMLNetAccessor.hpp>
  • icXML/icXML-devel/tests/src/ParserTest/ParserTest.cpp

    r2726 r2733  
    2424//  Includes
    2525// ---------------------------------------------------------------------------
    26 #include    <xercesc/util/PlatformUtils.hpp>
    27 #include    <xercesc/util/XMLString.hpp>
     26#include    <icxercesc/util/PlatformUtils.hpp>
     27#include    <icxercesc/util/XMLString.hpp>
    2828#include    <xercesc/util/XMLURL.hpp>
    29 #include    <xercesc/internal/XMLScanner.hpp>
    30 #include    <xercesc/validators/DTD/DTDValidator.hpp>
     29#include    <icxercesc/internal/XMLScanner.hpp>
     30#include    <icxercesc/validators/DTD/DTDValidator.hpp>
    3131#include    "ParserTest.hpp"
    3232
  • icXML/icXML-devel/tests/src/ParserTest/ParserTest.hpp

    r2726 r2733  
    3939#include "ParserTest_Parser.hpp"
    4040#include <stdlib.h>
    41 #include <xercesc/util/PlatformUtils.hpp>
     41#include <icxercesc/util/PlatformUtils.hpp>
    4242
    4343#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/tests/src/ParserTest/ParserTest_Parser.cpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include <xercesc/util/RefVectorOf.hpp>
    27 #include <xercesc/util/XMLString.hpp>
     27#include <icxercesc/util/XMLString.hpp>
    2828#include <xercesc/util/XMLUni.hpp>
    29 #include <xercesc/internal/XMLReader.hpp>
    30 #include <xercesc/internal/XMLScanner.hpp>
    31 #include <xercesc/framework/XMLAttr.hpp>
     29#include <icxercesc/internal/XMLReader.hpp>
     30#include <icxercesc/internal/XMLScanner.hpp>
     31#include <icxercesc/framework/XMLAttr.hpp>
    3232#include <xercesc/framework/XMLNotationDecl.hpp>
    33 #include <xercesc/framework/XMLValidator.hpp>
    34 #include <xercesc/validators/DTD/DTDAttDef.hpp>
    35 #include <xercesc/validators/DTD/DTDElementDecl.hpp>
     33#include <icxercesc/framework/XMLValidator.hpp>
     34#include <icxercesc/validators/DTD/DTDAttDef.hpp>
     35#include <icxercesc/validators/DTD/DTDElementDecl.hpp>
    3636#include <xercesc/validators/DTD/DTDEntityDecl.hpp>
    3737#include "ParserTest.hpp"
  • icXML/icXML-devel/tests/src/ThreadTest/ThreadTest.cpp

    r2726 r2733  
    3030#include <string.h>
    3131#include <ctype.h>
    32 #include <xercesc/parsers/SAXParser.hpp>
     32#include <icxercesc/parsers/SAXParser.hpp>
    3333#include <xercesc/parsers/XercesDOMParser.hpp>
    34 #include <xercesc/util/PlatformUtils.hpp>
    35 #include <xercesc/sax/HandlerBase.hpp>
     34#include <icxercesc/util/PlatformUtils.hpp>
     35#include <icxercesc/sax/HandlerBase.hpp>
    3636#include <xercesc/framework/MemBufInputSource.hpp>
    3737
     
    3939#include <xercesc/sax2/XMLReaderFactory.hpp>
    4040#include <xercesc/sax2/Attributes.hpp>
    41 #include <xercesc/sax2/DefaultHandler.hpp>
     41#include <icxercesc/sax2/DefaultHandler.hpp>
    4242
    4343#include <xercesc/dom/DOM.hpp>
    4444
    4545#include <xercesc/framework/StdOutFormatTarget.hpp>
    46 #include <xercesc/framework/XMLGrammarPoolImpl.hpp>
     46#include <icxercesc/framework/XMLGrammarPoolImpl.hpp>
    4747#include <xercesc/internal/MemoryManagerImpl.hpp>
    4848#include <xercesc/util/OutOfMemoryException.hpp>
  • icXML/icXML-devel/tests/src/UtilTests/CoreTests.hpp

    r2726 r2733  
    2121
    2222#include <xercesc/util/XMLException.hpp>
    23 #include <xercesc/util/XMLString.hpp>
     23#include <icxercesc/util/XMLString.hpp>
    2424#include <xercesc/util/XMLUni.hpp>
    25 #include <xercesc/util/PlatformUtils.hpp>
     25#include <icxercesc/util/PlatformUtils.hpp>
    2626
    2727#if defined(XERCES_NEW_IOSTREAMS)
  • icXML/icXML-devel/tests/src/UtilTests/CoreTestsMain.cpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include "CoreTests.hpp"
    27 #include <xercesc/util/PlatformUtils.hpp>
     27#include <icxercesc/util/PlatformUtils.hpp>
    2828
    2929
  • icXML/icXML-devel/tests/src/UtilTests/CoreTests_RefHashTable.cpp

    r2726 r2733  
    2424// ---------------------------------------------------------------------------
    2525#include "CoreTests.hpp"
    26 #include <xercesc/util/RefHashTableOf.hpp>
     26#include <icxercesc/util/RefHashTableOf.hpp>
    2727
    2828
  • icXML/icXML-devel/tests/src/UtilTests/CoreTests_Transcoders.cpp

    r2726 r2733  
    2525// ---------------------------------------------------------------------------
    2626#include "CoreTests.hpp"
    27 #include <xercesc/util/XMLASCIITranscoder.hpp>
     27#include <icxercesc/util/XMLASCIITranscoder.hpp>
    2828#include <xercesc/util/Janitor.hpp>
    29 #include <xercesc/util/PlatformUtils.hpp>
    30 #include <xercesc/util/TransService.hpp>
     29#include <icxercesc/util/PlatformUtils.hpp>
     30#include <icxercesc/util/TransService.hpp>
    3131
    3232
  • icXML/icXML-devel/tests/src/XSTSHarness/XSTSHarness.cpp

    r2726 r2733  
    2727#include "XSTSHarnessHandlers.hpp"
    2828#include "XMLHarnessHandlers.hpp"
    29 #include <xercesc/util/PlatformUtils.hpp>
     29#include <icxercesc/util/PlatformUtils.hpp>
    3030#include <xercesc/util/OutOfMemoryException.hpp>
    3131#include <xercesc/util/BinInputStream.hpp>
  • icXML/icXML-devel/tests/src/XSTSHarness/XSTSHarness.hpp

    r2726 r2733  
    2727// ---------------------------------------------------------------------------
    2828
    29 #include <xercesc/util/PlatformUtils.hpp>
     29#include <icxercesc/util/PlatformUtils.hpp>
    3030#include <stdlib.h>
    3131#include <string.h>
     
    3737#include <xercesc/sax2/XMLReaderFactory.hpp>
    3838#include <xercesc/sax2/SAX2XMLReader.hpp>
    39 #include <xercesc/sax2/DefaultHandler.hpp>
     39#include <icxercesc/sax2/DefaultHandler.hpp>
    4040#include <xercesc/util/XMLURL.hpp>
    4141#include <xercesc/util/XMLEntityResolver.hpp>
  • icXML/icXML-devel/tests/src/XSTSHarness/XSTSHarnessHandlers.cpp

    r2726 r2733  
    2929#include <xercesc/validators/common/Grammar.hpp>
    3030#include <xercesc/util/OutOfMemoryException.hpp>
    31 #include <xercesc/parsers/SAX2XMLReaderImpl.hpp>
     31#include <icxercesc/parsers/SAX2XMLReaderImpl.hpp>
    3232
    3333// ---------------------------------------------------------------------------
  • icXML/icXML-devel/tests/src/XSTSHarness/XSTSHarnessHandlers.hpp

    r2726 r2733  
    2727#include <xercesc/sax2/SAX2XMLReader.hpp>
    2828#include <xercesc/sax2/Attributes.hpp>
    29 #include <xercesc/sax2/DefaultHandler.hpp>
     29#include <icxercesc/sax2/DefaultHandler.hpp>
    3030#include <xercesc/util/RefVectorOf.hpp>
    3131
  • icXML/icXML-devel/tests/src/XSValueTest/XSValueTest.cpp

    r2726 r2733  
    2525#include "XSValueTest.hpp"
    2626
    27 #include <xercesc/validators/schema/SchemaSymbols.hpp>
     27#include <icxercesc/validators/schema/SchemaSymbols.hpp>
    2828#include <xercesc/util/XMLUni.hpp>
    2929
     
    4242
    4343#include <xercesc/framework/psvi/XSValue.hpp>
    44 #include <xercesc/util/PlatformUtils.hpp>
     44#include <icxercesc/util/PlatformUtils.hpp>
    4545
    4646static const char* null_string=0;
  • icXML/icXML-devel/tests/src/XSValueTest/XSValueTest.hpp

    r2726 r2733  
    3434#endif
    3535
    36 #include <xercesc/util/XMLString.hpp>
     36#include <icxercesc/util/XMLString.hpp>
    3737
    3838XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/tests/src/XSerializerTest/XSerializerHandlers.hpp

    r2726 r2733  
    2727// ---------------------------------------------------------------------------
    2828#include <xercesc/sax2/Attributes.hpp>
    29 #include <xercesc/sax2/DefaultHandler.hpp>
     29#include <icxercesc/sax2/DefaultHandler.hpp>
    3030
    3131XERCES_CPP_NAMESPACE_USE
  • icXML/icXML-devel/tests/src/XSerializerTest/XSerializerTest.cpp

    r2726 r2733  
    2525//  Includes
    2626// ---------------------------------------------------------------------------
    27 #include <xercesc/framework/XMLGrammarPoolImpl.hpp>
     27#include <icxercesc/framework/XMLGrammarPoolImpl.hpp>
    2828#include <xercesc/internal/MemoryManagerImpl.hpp>
    2929#include <xercesc/internal/XSerializationException.hpp>
  • icXML/icXML-devel/tests/src/XSerializerTest/XSerializerTest.hpp

    r2726 r2733  
    2626//  Includes for all the program files to see
    2727// ---------------------------------------------------------------------------
    28 #include <xercesc/util/PlatformUtils.hpp>
     28#include <icxercesc/util/PlatformUtils.hpp>
    2929#include <stdlib.h>
    3030#include <string.h>
Note: See TracChangeset for help on using the changeset viewer.