blautenb 2003/09/11 04:11:06
Modified: c/src/utils XSECDOMUtils.cpp XSECDOMUtils.hpp
XSECNameSpaceExpander.cpp XSECNameSpaceExpander.hpp
XSECSafeBufferFormatter.cpp
XSECSafeBufferFormatter.hpp XSECTXFMInputSource.cpp
XSECTXFMInputSource.hpp XSECXPathNodeList.cpp
XSECXPathNodeList.hpp
c/src/utils/winutils XSECBinHTTPURIInputStream.cpp
XSECBinHTTPURIInputStream.hpp
XSECURIResolverGenericWin32.cpp
XSECURIResolverGenericWin32.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace
in headers
Revision Changes Path
1.14 +1 -5 xml-security/c/src/utils/XSECDOMUtils.cpp
Index: XSECDOMUtils.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSECDOMUtils.cpp 8 Sep 2003 12:07:49 -0000 1.13
+++ XSECDOMUtils.cpp 11 Sep 2003 11:11:05 -0000 1.14
@@ -82,11 +82,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/TransService.hpp>
-XSEC_USING_XERCES(XMLTransService);
-XSEC_USING_XERCES(XMLTranscoder);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(Janitor);
-XSEC_USING_XERCES(chNull);
+XERCES_CPP_NAMESPACE_USE
//
--------------------------------------------------------------------------------
// Utilities to manipulate DSIG namespaces
1.12 +10 -13 xml-security/c/src/utils/XSECDOMUtils.hpp
Index: XSECDOMUtils.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSECDOMUtils.hpp 8 Sep 2003 12:07:49 -0000 1.11
+++ XSECDOMUtils.hpp 11 Sep 2003 11:11:05 -0000 1.12
@@ -82,9 +82,6 @@
#include <xercesc/dom/DOM.hpp>
#include <xercesc/util/XMLString.hpp>
-XSEC_USING_XERCES(DOMNode);
-XSEC_USING_XERCES(XMLString);
-
#define COMPARE_STRING_LENGTH 256
//
--------------------------------------------------------------------------------
@@ -114,10 +111,10 @@
// Utilities to manipulate namespaces
//
--------------------------------------------------------------------------------
-const XMLCh DSIG_EXPORT * getDSIGLocalName(const DOMNode *node);
-const XMLCh DSIG_EXPORT * getECLocalName(const DOMNode *node);
-const XMLCh DSIG_EXPORT * getXPFLocalName(const DOMNode *node);
-const XMLCh DSIG_EXPORT * getXENCLocalName(const DOMNode *node);
+const XMLCh DSIG_EXPORT * getDSIGLocalName(const
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *node);
+const XMLCh DSIG_EXPORT * getECLocalName(const
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *node);
+const XMLCh DSIG_EXPORT * getXPFLocalName(const
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *node);
+const XMLCh DSIG_EXPORT * getXENCLocalName(const
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *node);
//
--------------------------------------------------------------------------------
// Do UTF-8 <-> UTF-16 transcoding
@@ -129,15 +126,15 @@
// Find a nominated DSIG/XENC node in a document
//
--------------------------------------------------------------------------------
-DOMNode DSIG_EXPORT * findDSIGNode(DOMNode *n, const char * nodeName);
-DOMNode DSIG_EXPORT * findXENCNode(DOMNode *n, const char * nodeName);
+XERCES_CPP_NAMESPACE_QUALIFIER DOMNode DSIG_EXPORT *
findDSIGNode(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n, const char * nodeName);
+XERCES_CPP_NAMESPACE_QUALIFIER DOMNode DSIG_EXPORT *
findXENCNode(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n, const char * nodeName);
//
--------------------------------------------------------------------------------
// Find particular type of node child
//
--------------------------------------------------------------------------------
-DOMNode DSIG_EXPORT * findFirstChildOfType(DOMNode *n, DOMNode::NodeType t);
-DOMNode DSIG_EXPORT * findNextChildOfType(DOMNode *n, DOMNode::NodeType t);
+XERCES_CPP_NAMESPACE_QUALIFIER DOMNode DSIG_EXPORT *
findFirstChildOfType(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n,
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode::NodeType t);
+XERCES_CPP_NAMESPACE_QUALIFIER DOMNode DSIG_EXPORT *
findNextChildOfType(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n,
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode::NodeType t);
//
--------------------------------------------------------------------------------
// Make a QName
@@ -151,7 +148,7 @@
// Gather text from children
//
--------------------------------------------------------------------------------
-void DSIG_EXPORT gatherChildrenText(DOMNode * parent, safeBuffer &output);
+void DSIG_EXPORT gatherChildrenText(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *
parent, safeBuffer &output);
//
--------------------------------------------------------------------------------
// String decode/encode
1.5 +2 -6 xml-security/c/src/utils/XSECNameSpaceExpander.cpp
Index: XSECNameSpaceExpander.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECNameSpaceExpander.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECNameSpaceExpander.cpp 5 Jul 2003 10:30:37 -0000 1.4
+++ XSECNameSpaceExpander.cpp 11 Sep 2003 11:11:05 -0000 1.5
@@ -63,11 +63,7 @@
* XSECNameSpaceExander := Class for expanding out a document's name space
axis
* and then shrinking again
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -77,7 +73,7 @@
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
+XERCES_CPP_NAMESPACE_USE
XSECNameSpaceExpander::XSECNameSpaceExpander(DOMDocument *d) {
1.6 +12 -12 xml-security/c/src/utils/XSECNameSpaceExpander.hpp
Index: XSECNameSpaceExpander.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECNameSpaceExpander.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECNameSpaceExpander.hpp 5 Jul 2003 10:30:37 -0000 1.5
+++ XSECNameSpaceExpander.hpp 11 Sep 2003 11:11:05 -0000 1.6
@@ -63,8 +63,6 @@
* XSECNameSpaceHolder := Container class for holding and managing the name
space stack
* Used when running through a
DOM document
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -91,9 +89,9 @@
struct XSECNameSpaceEntry {
// Variables
- safeBuffer m_name;
// The name for this name space
- DOMElement *
mp_node; // The Element Node owner
- DOMNode *
mp_att; // The added attribute node
+ safeBuffer
m_name; // The name for this name space
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * mp_node;
// The Element Node owner
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_att;
// The added attribute node
};
@@ -157,7 +155,7 @@
* @param d The DOM document to be expanded.
*/
- XSECNameSpaceExpander(DOMDocument *d); // Constructor
+ XSECNameSpaceExpander(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *d);
// Constructor
/**
* \brief Fragment constructor
@@ -168,7 +166,7 @@
* @param f The starting element of the fragment to be expanded.
*/
- XSECNameSpaceExpander(DOMElement *f); // frag Constructor
+ XSECNameSpaceExpander(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *f);
// frag Constructor
~XSECNameSpaceExpander();
// Default destructor
@@ -194,18 +192,20 @@
void deleteAddedNamespaces(void);
// Check if a node is an added node
- bool nodeWasAdded(DOMNode *n);
+ bool nodeWasAdded(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n);
private: // Functions
XSECNameSpaceExpander(void); // No
default constructor
- void recurse(DOMElement *n);
+ void recurse(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *n);
// data
NameSpaceEntryListVectorType m_lst; // List of
added name spaces
- DOMDocument * mp_doc;
// The owner document
- DOMElement * mp_fragment; // If we are doing a
fragment
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ *
mp_doc; // The owner document
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement
+ *
mp_fragment; // If we are doing a fragment
bool m_expanded;
// Have we expanded already?
XSECSafeBufferFormatter * mp_formatter;
1.7 +2 -36 xml-security/c/src/utils/XSECSafeBufferFormatter.cpp
Index: XSECSafeBufferFormatter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBufferFormatter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECSafeBufferFormatter.cpp 28 Jul 2003 12:52:46 -0000 1.6
+++ XSECSafeBufferFormatter.cpp 11 Sep 2003 11:11:05 -0000 1.7
@@ -62,8 +62,6 @@
*
* XSECSafeBufferFormatter := Class for formatting DOMStrings into
SafeBuffers
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -72,39 +70,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xsec/framework/XSECError.hpp>
-//XMLFormatter& operator<< (XMLFormatter& strm, const DOMString& s);
-/*
-{
- unsigned int lent = s.length();
-
- if (lent <= 0)
- lent = 0;
-
- XMLCh* buf = new XMLCh[lent + 1];
- if (lent > 0)
- XMLString::copyNString(buf, s.rawBuffer(), lent);
- buf[lent] = 0;
- strm << buf;
- delete [] buf;
- return strm;
-}
-*/
-
-// -----------------------------------------------------------------------
-// If the caller tells us the local coding type, this allows us to work
-// easily with safe buffers and DOMStrings
-// -----------------------------------------------------------------------
-
-
-/* class XSECSafeBufferFormatter {
-
- XMLFormatter * formatter; // To actually perform
the formatting
- safeBuffer formatBuffer; // Storage of
translated strings
- sbFormatTarget * sbf; // Format
target used by XMLFormatter
-
-public:
-
- */
+XERCES_CPP_NAMESPACE_USE
// Constructor
1.6 +24 -17 xml-security/c/src/utils/XSECSafeBufferFormatter.hpp
Index: XSECSafeBufferFormatter.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBufferFormatter.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECSafeBufferFormatter.hpp 5 Jul 2003 10:30:37 -0000 1.5
+++ XSECSafeBufferFormatter.hpp 11 Sep 2003 11:11:05 -0000 1.6
@@ -79,14 +79,11 @@
#include <xercesc/framework/XMLFormatter.hpp>
-XSEC_USING_XERCES(XMLFormatter);
-XSEC_USING_XERCES(XMLFormatTarget);
-
/** @addtogroup internal
* @{
*/
-class sbFormatTarget : public XMLFormatTarget
+class sbFormatTarget : public XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatTarget
{
public:
@@ -105,7 +102,7 @@
void writeChars(const XMLByte* const toWrite,
const unsigned int count,
- XMLFormatter * const formatter)
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter * const
formatter)
{
buffer->sbMemcpyIn((char *) toWrite, (int) count);
buffer->setBufferType(safeBuffer::BUFFER_CHAR);
@@ -130,7 +127,8 @@
class XSECSafeBufferFormatter {
- XMLFormatter * formatter; // To actually perform
the formatting
+ XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter
+ * formatter; // To
actually perform the formatting
safeBuffer formatBuffer; // Storage of
translated strings
sbFormatTarget * sbf; // Format
target used by XMLFormatter
@@ -140,13 +138,19 @@
XSECSafeBufferFormatter(
const XMLCh * const
outEncoding,
- const XMLFormatter::EscapeFlags
escapeFlags=XMLFormatter::NoEscapes,
- const XMLFormatter::UnRepFlags
unrepFlags=XMLFormatter::UnRep_Fail);
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::EscapeFlags
+ escapeFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::NoEscapes,
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::UnRepFlags
+ unrepFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::UnRep_Fail
+ );
XSECSafeBufferFormatter(
const char * const
outEncoding,
- const XMLFormatter::EscapeFlags
escapeFlags=XMLFormatter::NoEscapes,
- const XMLFormatter::UnRepFlags
unrepFlags=XMLFormatter::UnRep_Fail);
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::EscapeFlags
+ escapeFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::NoEscapes,
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::UnRepFlags
+ unrepFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::UnRep_Fail
+ );
// Destructor
@@ -157,8 +161,11 @@
void formatBuf (
const XMLCh *const toFormat,
const unsigned int count,
- const XMLFormatter::EscapeFlags
escapeFlags=XMLFormatter::DefaultEscape,
- const XMLFormatter::UnRepFlags
unrepFlags=XMLFormatter::DefaultUnRep); // Format a buffer
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::EscapeFlags
+ escapeFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::DefaultEscape,
+ const XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::UnRepFlags
+ unrepFlags=XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::DefaultUnRep
+ ); // Format a buffer
XSECSafeBufferFormatter& operator<< (
const XMLCh *const toFormat);
// Format a buffer
@@ -168,11 +175,11 @@
const XMLCh* getEncodingName ()const; // Get
current encoding
- void setEscapeFlags (const XMLFormatter::EscapeFlags newFlags);
- void setUnRepFlags (const XMLFormatter::UnRepFlags newFlags);
+ void setEscapeFlags (const XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::EscapeFlags newFlags);
+ void setUnRepFlags (const XERCES_CPP_NAMESPACE_QUALIFIER
XMLFormatter::UnRepFlags newFlags);
- XSECSafeBufferFormatter& operator<< (const XMLFormatter::EscapeFlags
newFlags);
- XSECSafeBufferFormatter& operator<< (const XMLFormatter::UnRepFlags
newFlags);
+ XSECSafeBufferFormatter& operator<< (const
XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::EscapeFlags newFlags);
+ XSECSafeBufferFormatter& operator<< (const
XERCES_CPP_NAMESPACE_QUALIFIER XMLFormatter::UnRepFlags newFlags);
//XSECSafeBufferFormatter& operator<< (const DOMString &s);
// Friends for working with safestrings
1.5 +2 -15 xml-security/c/src/utils/XSECTXFMInputSource.cpp
Index: XSECTXFMInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECTXFMInputSource.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECTXFMInputSource.cpp 28 Jul 2003 12:52:46 -0000 1.4
+++ XSECTXFMInputSource.cpp 11 Sep 2003 11:11:05 -0000 1.5
@@ -62,23 +62,8 @@
*
* XSECTXFMInputSource := Transfomer InputSource for Xerces Parser.
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
- * $Log$
- * Revision 1.4 2003/07/28 12:52:46 blautenb
- * Fixed a bug with DEBUG_NEW when compiling with Xalan 1.6
- *
- * Revision 1.3 2003/07/05 10:30:37 blautenb
- * Copyright update
- *
- * Revision 1.2 2003/02/21 11:53:09 blautenb
- * TXFMChain to prevent memory leaks
- *
- * Revision 1.1 2003/02/17 11:19:12 blautenb
- * Class to use a transform as an InputSource to Xerces
- *
*
*/
@@ -90,8 +75,7 @@
#include <xercesc/util/BinInputStream.hpp>
-XSEC_USING_XERCES(BinInputStream);
-
+XERCES_CPP_NAMESPACE_USE
//
--------------------------------------------------------------------------------
// Construct/Destruct
1.5 +2 -15 xml-security/c/src/utils/XSECTXFMInputSource.hpp
Index: XSECTXFMInputSource.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECTXFMInputSource.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECTXFMInputSource.hpp 5 Jul 2003 10:30:37 -0000 1.4
+++ XSECTXFMInputSource.hpp 11 Sep 2003 11:11:05 -0000 1.5
@@ -62,23 +62,7 @@
*
* XSECTXFMInputSource := Transfomer InputSource for Xerces Parser.
*
- * Author(s): Berin Lautenbach
- *
* $Id$
- *
- * $Log$
- * Revision 1.4 2003/07/05 10:30:37 blautenb
- * Copyright update
- *
- * Revision 1.3 2003/03/02 08:21:02 blautenb
- * Fixes for a clean doxygen run
- *
- * Revision 1.2 2003/02/21 11:53:09 blautenb
- * TXFMChain to prevent memory leaks
- *
- * Revision 1.1 2003/02/17 11:19:12 blautenb
- * Class to use a transform as an InputSource to Xerces
- *
*
*/
@@ -145,7 +129,7 @@
* Returns an InputStream that can be read by the parser
*/
- BinInputStream* makeStream() const;
+ XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream* makeStream() const;
//@}
1.7 +2 -4 xml-security/c/src/utils/XSECXPathNodeList.cpp
Index: XSECXPathNodeList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECXPathNodeList.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECXPathNodeList.cpp 5 Jul 2003 10:30:37 -0000 1.6
+++ XSECXPathNodeList.cpp 11 Sep 2003 11:11:05 -0000 1.7
@@ -63,8 +63,6 @@
* XSECXPathNodeList := A structure to hold node lists from XPath
* evaluations
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -76,7 +74,7 @@
#include <string.h>
-
+XERCES_CPP_NAMESPACE_USE
//
--------------------------------------------------------------------------------
// Constructors and Destructors.
1.6 +9 -8 xml-security/c/src/utils/XSECXPathNodeList.hpp
Index: XSECXPathNodeList.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECXPathNodeList.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECXPathNodeList.hpp 5 Jul 2003 10:30:37 -0000 1.5
+++ XSECXPathNodeList.hpp 11 Sep 2003 11:11:05 -0000 1.6
@@ -149,7 +149,7 @@
* @param n The node to add.
*/
- void addNode(const DOMNode *n);
+ void addNode(const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n);
/**
* \brief Remove a node from the list.
@@ -159,7 +159,7 @@
* @param n The node to be removed.
*/
- void removeNode(const DOMNode *n);
+ void removeNode(const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n);
/**
* \brief Clear out the entire list, deleting all entries.
@@ -179,7 +179,7 @@
* @param n The node to find in the list.
*/
- bool hasNode(const DOMNode *n);
+ bool hasNode(const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *n);
/**
* \brief Get the first node in the list.
@@ -189,7 +189,7 @@
* @returns The first node in the list or NULL if none exist
*/
- const DOMNode * getFirstNode(void);
+ const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * getFirstNode(void);
/**
* \brief Get the next node in the list
@@ -199,7 +199,7 @@
* @returns The next node in the list of NULL if none exist
*/
- const DOMNode *getNextNode(void);
+ const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getNextNode(void);
//@}
@@ -221,9 +221,10 @@
private:
// Internal functions
- unsigned int findNodeIndex(const DOMNode * n);
+ unsigned int findNodeIndex(const XERCES_CPP_NAMESPACE::DOMNode * n);
- const DOMNode ** mp_elts;
// The current list of elements
+ const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ **
mp_elts; // The current list of elements
unsigned int m_size;
// How big is the current array
unsigned int m_num;
// Number of elements in the array
1.5 +2 -20
xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.cpp
Index: XSECBinHTTPURIInputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECBinHTTPURIInputStream.cpp 5 Jul 2003 10:30:38 -0000 1.4
+++ XSECBinHTTPURIInputStream.cpp 11 Sep 2003 11:11:05 -0000 1.5
@@ -68,24 +68,8 @@
* NOTE: Much code taken from Xerces, and the cross platform interfacing is
* no-where near as nice.
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
- * $Log$
- * Revision 1.4 2003/07/05 10:30:38 blautenb
- * Copyright update
- *
- * Revision 1.3 2003/03/15 22:41:46 blautenb
- * Add 301 (permanently moved) support
- *
- * Revision 1.2 2003/02/13 10:19:43 blautenb
- * Updated Xerces exceptions to Xsec exception
- *
- * Revision 1.1 2003/02/12 09:45:29 blautenb
- * Win32 Re-implementation of Xerces URIResolver to support re-directs
- *
- *
*/
#include <xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp>
@@ -109,12 +93,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-XSEC_USING_XERCES(NetAccessorException);
-XSEC_USING_XERCES(XMLExcepts);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(XMLMutexLock);
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
#include <xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp>
#include <xsec/framework/XSECError.hpp>
1.3 +8 -9
xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.hpp
Index: XSECBinHTTPURIInputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/winutils/XSECBinHTTPURIInputStream.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECBinHTTPURIInputStream.hpp 5 Jul 2003 10:30:38 -0000 1.2
+++ XSECBinHTTPURIInputStream.hpp 11 Sep 2003 11:11:05 -0000 1.3
@@ -73,6 +73,9 @@
* $Id$
*
* $Log$
+ * Revision 1.3 2003/09/11 11:11:05 blautenb
+ * Cleaned up usage of Xerces namespace - no longer inject into global
namespace in headers
+ *
* Revision 1.2 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -93,10 +96,6 @@
#include <xercesc/util/BinInputStream.hpp>
#include <xercesc/util/Mutexes.hpp>
-XSEC_USING_XERCES(BinInputStream);
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(XMLMutex);
-
//
// This class implements the BinInputStream interface specified by the XML
// parser.
@@ -106,11 +105,11 @@
struct sockaddr;
-class DSIG_EXPORT XSECBinHTTPURIInputStream : public BinInputStream
+class DSIG_EXPORT XSECBinHTTPURIInputStream : public
XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
{
public :
- XSECBinHTTPURIInputStream(const XMLUri& urlSource);
+ XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri&
urlSource);
~XSECBinHTTPURIInputStream();
unsigned int curPos() const;
@@ -145,10 +144,10 @@
char * fBufferEnd;
char * fBufferPos;
static bool fInitialized;
- static XMLMutex* fInitMutex;
+ static XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex* fInitMutex;
static void Initialize();
- unsigned int getSocketHandle(const XMLUri& urlSource);
+ unsigned int getSocketHandle(const XERCES_CPP_NAMESPACE_QUALIFIER
XMLUri& urlSource);
inline static hostent* gethostbyname(const char* name);
inline static unsigned long inet_addr(const char* cp);
1.7 +19 -17
xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp
Index: XSECURIResolverGenericWin32.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECURIResolverGenericWin32.cpp 28 Jul 2003 12:52:46 -0000 1.6
+++ XSECURIResolverGenericWin32.cpp 11 Sep 2003 11:11:05 -0000 1.7
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.7 2003/09/11 11:11:05 blautenb
+ * Cleaned up usage of Xerces namespace - no longer inject into global
namespace in headers
+ *
* Revision 1.6 2003/07/28 12:52:46 blautenb
* Fixed a bug with DEBUG_NEW when compiling with Xalan 1.6
*
@@ -101,29 +104,28 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/BinFileInputStream.hpp>
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp>
static const XMLCh gFileScheme[] = {
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_f,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_i,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_l,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_e,
- XERCES_CPP_NAMESPACE_QUALIFIER chNull
+ chLatin_f,
+ chLatin_i,
+ chLatin_l,
+ chLatin_e,
+ chNull
};
static const XMLCh gHttpScheme[] = {
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_h,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_t,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_t,
- XERCES_CPP_NAMESPACE_QUALIFIER chLatin_p,
- XERCES_CPP_NAMESPACE_QUALIFIER chNull
+ chLatin_h,
+ chLatin_t,
+ chLatin_t,
+ chLatin_p,
+ chNull
};
@@ -132,10 +134,10 @@
static const XMLCh DOTDOT_SLASH[] = {
- XERCES_CPP_NAMESPACE_QUALIFIER chPeriod,
- XERCES_CPP_NAMESPACE_QUALIFIER chPeriod,
- XERCES_CPP_NAMESPACE_QUALIFIER chForwardSlash,
- XERCES_CPP_NAMESPACE_QUALIFIER chNull
+ chPeriod,
+ chPeriod,
+ chForwardSlash,
+ chNull
};
1.4 +6 -7
xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.hpp
Index: XSECURIResolverGenericWin32.hpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECURIResolverGenericWin32.hpp 5 Jul 2003 10:30:38 -0000 1.3
+++ XSECURIResolverGenericWin32.hpp 11 Sep 2003 11:11:05 -0000 1.4
@@ -66,11 +66,12 @@
* handle HTTP
redirects as is required by
* the DSIG
Standard
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
* $Log$
+ * Revision 1.4 2003/09/11 11:11:05 blautenb
+ * Cleaned up usage of Xerces namespace - no longer inject into global
namespace in headers
+ *
* Revision 1.3 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -93,8 +94,6 @@
#include <map>
-XSEC_USING_XERCES(XMLString);
-
/**
* @ingroup pubsig
@@ -143,7 +142,7 @@
* @returns The octet stream corresponding to the URI.
*/
- virtual BinInputStream * resolveURI(const XMLCh * uri);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream *
resolveURI(const XMLCh * uri);
/**
* \brief Clone the resolver to be installed in a new object.
@@ -178,4 +177,4 @@
};
-#endif /* XSECURIRESOLVERGENERICWIN32_INCLUDE */
\ No newline at end of file
+#endif /* XSECURIRESOLVERGENERICWIN32_INCLUDE */
