You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2003/09/11 13:11:30 UTC
cvs commit: xml-security/c/src/transformers TXFMBase.hpp TXFMBase64.cpp TXFMBase64.hpp TXFMC14n.cpp TXFMC14n.hpp TXFMCipher.cpp TXFMCipher.hpp TXFMDocObject.cpp TXFMDocObject.hpp TXFMEnvelope.cpp TXFMEnvelope.hpp TXFMMD5.cpp TXFMMD5.hpp TXFMOutputFile.cpp TXFMOutputFile.hpp TXFMParser.cpp TXFMParser.hpp TXFMSB.cpp TXFMSB.hpp TXFMSHA1.cpp TXFMSHA1.hpp TXFMURL.cpp TXFMURL.hpp TXFMXPath.cpp TXFMXPath.hpp TXFMXPathFilter.cpp TXFMXPathFilter.hpp TXFMXSL.cpp TXFMXSL.hpp
blautenb 2003/09/11 04:11:30
Modified: c/src/transformers TXFMBase.hpp TXFMBase64.cpp
TXFMBase64.hpp TXFMC14n.cpp TXFMC14n.hpp
TXFMCipher.cpp TXFMCipher.hpp TXFMDocObject.cpp
TXFMDocObject.hpp TXFMEnvelope.cpp TXFMEnvelope.hpp
TXFMMD5.cpp TXFMMD5.hpp TXFMOutputFile.cpp
TXFMOutputFile.hpp TXFMParser.cpp TXFMParser.hpp
TXFMSB.cpp TXFMSB.hpp TXFMSHA1.cpp TXFMSHA1.hpp
TXFMURL.cpp TXFMURL.hpp TXFMXPath.cpp TXFMXPath.hpp
TXFMXPathFilter.cpp TXFMXPathFilter.hpp TXFMXSL.cpp
TXFMXSL.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace in headers
Revision Changes Path
1.8 +7 -5 xml-security/c/src/transformers/TXFMBase.hpp
Index: TXFMBase.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMBase.hpp 5 Jul 2003 10:30:36 -0000 1.7
+++ TXFMBase.hpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -110,12 +110,14 @@
TXFMBase *input; // The input source that we read from
bool keepComments; // Each transform needs to tell the next whether comments are still in
XSECNameSpaceExpander * mp_nse; // For expanding document name spaces
- DOMDocument * mp_expansionDoc; // For expanding
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * mp_expansionDoc; // For expanding
XSECXPathNodeList m_XPathMap; // For node lists if necessary
public:
- TXFMBase(DOMDocument *doc) {input = NULL; keepComments = true; mp_nse = NULL; mp_expansionDoc = doc;}
+ TXFMBase(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc)
+ {input = NULL; keepComments = true; mp_nse = NULL; mp_expansionDoc = doc;}
virtual ~TXFMBase();
// For getting/setting input/output type
@@ -168,8 +170,8 @@
// BinInputStream methods:
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill) = 0;
- virtual DOMDocument *getDocument() = 0;
- virtual DOMNode *getFragmentNode() = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument() = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode() = 0;
virtual const XMLCh * getFragmentId() = 0;
virtual XSECXPathNodeList & getXPathNodeList() {return m_XPathMap;}
1.6 +3 -1 xml-security/c/src/transformers/TXFMBase64.cpp
Index: TXFMBase64.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase64.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMBase64.cpp 8 Sep 2003 12:07:49 -0000 1.5
+++ TXFMBase64.cpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -74,6 +74,8 @@
#include <xsec/utils/XSECPlatformUtils.hpp>
#include <xsec/framework/XSECException.hpp>
+XERCES_CPP_NAMESPACE_USE
+
TXFMBase64::TXFMBase64(DOMDocument *doc, bool decode) : TXFMBase(doc) {
m_complete = false; // Nothing yet to output
1.8 +4 -6 xml-security/c/src/transformers/TXFMBase64.hpp
Index: TXFMBase64.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase64.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMBase64.hpp 8 Sep 2003 12:07:49 -0000 1.7
+++ TXFMBase64.hpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -62,8 +62,6 @@
*
* TXFMBase64 := Class that performs a Base64 transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -84,7 +82,7 @@
// Constructors and destructors
- TXFMBase64(DOMDocument *doc, bool decode = true);
+ TXFMBase64(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, bool decode = true);
~TXFMBase64();
// Methods to get tranform output type and input requirement
@@ -100,8 +98,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.7 +3 -1 xml-security/c/src/transformers/TXFMC14n.cpp
Index: TXFMC14n.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMC14n.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMC14n.cpp 5 Jul 2003 10:30:36 -0000 1.6
+++ TXFMC14n.cpp 11 Sep 2003 11:11:29 -0000 1.7
@@ -73,6 +73,8 @@
#include <xsec/transformers/TXFMParser.hpp>
#include <xsec/framework/XSECError.hpp>
+XERCES_CPP_NAMESPACE_USE
+
TXFMC14n::TXFMC14n(DOMDocument *doc) : TXFMBase(doc) {
mp_c14n = NULL;
1.7 +4 -6 xml-security/c/src/transformers/TXFMC14n.hpp
Index: TXFMC14n.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMC14n.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMC14n.hpp 5 Jul 2003 10:30:36 -0000 1.6
+++ TXFMC14n.hpp 11 Sep 2003 11:11:29 -0000 1.7
@@ -62,8 +62,6 @@
*
* TXFMBaseC14n := Class that performs C14n canonicalisation
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -86,7 +84,7 @@
public:
- TXFMC14n(DOMDocument *doc);
+ TXFMC14n(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMC14n();
// Methods to set the inputs
@@ -109,8 +107,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.3 +3 -1 xml-security/c/src/transformers/TXFMCipher.cpp
Index: TXFMCipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMCipher.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TXFMCipher.cpp 8 Sep 2003 12:07:49 -0000 1.2
+++ TXFMCipher.cpp 11 Sep 2003 11:11:29 -0000 1.3
@@ -73,6 +73,8 @@
#include <xsec/utils/XSECPlatformUtils.hpp>
#include <xsec/framework/XSECException.hpp>
+XERCES_CPP_NAMESPACE_USE
+
TXFMCipher::TXFMCipher(DOMDocument *doc,
XSECCryptoKey * key,
bool encrypt) :
1.2 +4 -4 xml-security/c/src/transformers/TXFMCipher.hpp
Index: TXFMCipher.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMCipher.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TXFMCipher.hpp 31 Aug 2003 12:50:04 -0000 1.1
+++ TXFMCipher.hpp 11 Sep 2003 11:11:29 -0000 1.2
@@ -88,7 +88,7 @@
// Constructors and destructors
- TXFMCipher(DOMDocument *doc, XSECCryptoKey * key, bool encrypt);
+ TXFMCipher(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XSECCryptoKey * key, bool encrypt);
~TXFMCipher();
// Methods to get tranform output type and input requirement
@@ -108,8 +108,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.4 +3 -5 xml-security/c/src/transformers/TXFMDocObject.cpp
Index: TXFMDocObject.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMDocObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TXFMDocObject.cpp 5 Jul 2003 10:30:36 -0000 1.3
+++ TXFMDocObject.cpp 11 Sep 2003 11:11:29 -0000 1.4
@@ -62,17 +62,15 @@
*
* TXFMDocObject := Class that takes an input Document object ID to start a txfm pipe
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
#include <xsec/transformers/TXFMDocObject.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// Construct/Destruct
1.6 +17 -9 xml-security/c/src/transformers/TXFMDocObject.hpp
Index: TXFMDocObject.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMDocObject.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMDocObject.hpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMDocObject.hpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -85,15 +85,21 @@
public:
- TXFMDocObject(DOMDocument *doc);
+ TXFMDocObject(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMDocObject();
// Methods to set the inputs
void setInput(TXFMBase *newInput);
- void setInput(DOMDocument *doc, const XMLCh * newFragmentId);
- void setInput(DOMDocument *doc, DOMNode *newFragmentObject);
- void setInput(DOMDocument *doc);
+ void setInput(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
+ const XMLCh * newFragmentId
+ );
+ void setInput(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *newFragmentObject
+ );
+ void setInput(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
// Methods to get tranform output type and input requirement
@@ -104,15 +110,17 @@
// Methods to get output data
unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument * getDocument();
- virtual DOMNode * getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
XMLCh * fragmentId; // The identifier of the object
- DOMDocument * document; // The DOM document we are working with
- DOMNode * fragmentObject; // The object that contains the doc fragment to use
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * document; // The DOM document we are working with
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * fragmentObject; // The object that contains the doc fragment to use
TXFMBase::nodeType type; // The type of nodes this holds
1.6 +3 -3 xml-security/c/src/transformers/TXFMEnvelope.cpp
Index: TXFMEnvelope.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMEnvelope.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMEnvelope.cpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMEnvelope.cpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -62,8 +62,6 @@
*
* TXFMEnvelope := Class that calculates an Envelope with an XPath evaluator
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -71,6 +69,8 @@
#include <xsec/transformers/TXFMEnvelope.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
+
+XERCES_CPP_NAMESPACE_USE
TXFMEnvelope::TXFMEnvelope(DOMDocument *doc) :
TXFMBase(doc) {
1.6 +7 -9 xml-security/c/src/transformers/TXFMEnvelope.hpp
Index: TXFMEnvelope.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMEnvelope.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMEnvelope.hpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMEnvelope.hpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -62,8 +62,6 @@
*
* TXFMEnvelope := Class that calculates an Envelope with an XPath evaluator
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -86,12 +84,12 @@
private:
- DOMDocument * mp_document;
- DOMNode * mp_startNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * mp_document;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_startNode;
public:
- TXFMEnvelope(DOMDocument *doc);
+ TXFMEnvelope(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMEnvelope();
// Methods to set the inputs
@@ -106,13 +104,13 @@
// Envelope unique
- void evaluateEnvelope(DOMNode *t);
+ void evaluateEnvelope(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *t);
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
virtual XSECXPathNodeList & getXPathNodeList();
private:
1.3 +3 -3 xml-security/c/src/transformers/TXFMMD5.cpp
Index: TXFMMD5.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMMD5.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TXFMMD5.cpp 5 Jul 2003 10:30:36 -0000 1.2
+++ TXFMMD5.cpp 11 Sep 2003 11:11:29 -0000 1.3
@@ -62,8 +62,6 @@
*
* TXFMMD5 := Class that performs a MD5 transform
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -73,6 +71,8 @@
#include <xsec/transformers/TXFMMD5.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
#include <xsec/framework/XSECException.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// Standarad includes
1.4 +4 -4 xml-security/c/src/transformers/TXFMMD5.hpp
Index: TXFMMD5.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMMD5.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TXFMMD5.hpp 5 Jul 2003 10:30:36 -0000 1.3
+++ TXFMMD5.hpp 11 Sep 2003 11:11:29 -0000 1.4
@@ -93,7 +93,7 @@
public:
- TXFMMD5(DOMDocument *doc, XSECCryptoKey * key = NULL);
+ TXFMMD5(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XSECCryptoKey * key = NULL);
~TXFMMD5();
// Methods to get tranform output type and input requirement
@@ -109,8 +109,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.6 +3 -3 xml-security/c/src/transformers/TXFMOutputFile.cpp
Index: TXFMOutputFile.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMOutputFile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMOutputFile.cpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMOutputFile.cpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -63,14 +63,14 @@
* TXFMOutputFile := Transform that outputs the byte stream to a file without changing
* the actual data in any way
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
#include <xsec/transformers/TXFMOutputFile.hpp>
#include <xsec/framework/XSECException.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// Destructor
1.7 +5 -6 xml-security/c/src/transformers/TXFMOutputFile.hpp
Index: TXFMOutputFile.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMOutputFile.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMOutputFile.hpp 5 Jul 2003 10:30:36 -0000 1.6
+++ TXFMOutputFile.hpp 11 Sep 2003 11:11:29 -0000 1.7
@@ -63,8 +63,6 @@
* TXFMOutputFile := Transform that outputs the byte stream to a file without changing
* the actual data in any way
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -98,7 +96,8 @@
public:
- TXFMOutputFile(DOMDocument *doc) : TXFMBase(doc) {input = NULL;}
+ TXFMOutputFile(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc) :
+ TXFMBase(doc) {input = NULL;}
~TXFMOutputFile();
// Methods to set the inputs
@@ -118,8 +117,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.4 +2 -6 xml-security/c/src/transformers/TXFMParser.cpp
Index: TXFMParser.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TXFMParser.cpp 5 Jul 2003 10:30:36 -0000 1.3
+++ TXFMParser.cpp 11 Sep 2003 11:11:29 -0000 1.4
@@ -78,11 +78,7 @@
#include <xercesc/framework/MemBufInputSource.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(MemBufInputSource);
-XSEC_USING_XERCES(Janitor);
-
-
+XERCES_CPP_NAMESPACE_USE
TXFMParser::TXFMParser(DOMDocument * doc) :
TXFMBase(doc),
1.6 +5 -7 xml-security/c/src/transformers/TXFMParser.hpp
Index: TXFMParser.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMParser.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMParser.hpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMParser.hpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -62,8 +62,6 @@
*
* TXFMParser := A transformer used to transform a byte stream to DOM Nodes
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -92,7 +90,7 @@
// Constructors and destructors
- TXFMParser(DOMDocument *);
+ TXFMParser(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *);
~TXFMParser();
// Methods to get tranform output type and input requirement
@@ -108,8 +106,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
// Name space management
@@ -121,7 +119,7 @@
TXFMParser();
- DOMDocument * mp_parsedDoc;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * mp_parsedDoc;
};
1.6 +3 -5 xml-security/c/src/transformers/TXFMSB.cpp
Index: TXFMSB.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMSB.cpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMSB.cpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -62,15 +62,13 @@
*
* TXFMSB := Class that takes an input safeBuffer to start a transform pipe
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
#include <xsec/transformers/TXFMSB.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// General includes
1.8 +4 -6 xml-security/c/src/transformers/TXFMSB.hpp
Index: TXFMSB.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMSB.hpp 5 Jul 2003 10:30:36 -0000 1.7
+++ TXFMSB.hpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -62,8 +62,6 @@
*
* TXFMSB := Class that takes an input from a safeBuffer to start a pipe
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -86,7 +84,7 @@
public:
- TXFMSB(DOMDocument *doc);
+ TXFMSB(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMSB();
// Methods to set the inputs
@@ -104,8 +102,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.5 +2 -4 xml-security/c/src/transformers/TXFMSHA1.cpp
Index: TXFMSHA1.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSHA1.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TXFMSHA1.cpp 5 Jul 2003 10:30:36 -0000 1.4
+++ TXFMSHA1.cpp 11 Sep 2003 11:11:29 -0000 1.5
@@ -62,8 +62,6 @@
*
* TXFMSHA1 := Class that performs a SHA1 transform
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -74,7 +72,7 @@
#include <xsec/utils/XSECPlatformUtils.hpp>
#include <xsec/framework/XSECException.hpp>
-// Standarad includes
+XERCES_CPP_NAMESPACE_USE
TXFMSHA1::TXFMSHA1(DOMDocument *doc,
XSECCryptoKey * key) : TXFMBase (doc) {
1.7 +4 -6 xml-security/c/src/transformers/TXFMSHA1.hpp
Index: TXFMSHA1.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSHA1.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMSHA1.hpp 5 Jul 2003 10:30:36 -0000 1.6
+++ TXFMSHA1.hpp 11 Sep 2003 11:11:29 -0000 1.7
@@ -62,8 +62,6 @@
*
* TXFMSHA1 := Class that performs a SHA1 transform
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -90,7 +88,7 @@
public:
- TXFMSHA1(DOMDocument *doc, XSECCryptoKey * key = NULL);
+ TXFMSHA1(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XSECCryptoKey * key = NULL);
~TXFMSHA1();
// Methods to get tranform output type and input requirement
@@ -106,8 +104,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private:
1.6 +2 -6 xml-security/c/src/transformers/TXFMURL.cpp
Index: TXFMURL.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMURL.cpp 5 Jul 2003 10:30:36 -0000 1.5
+++ TXFMURL.cpp 11 Sep 2003 11:11:29 -0000 1.6
@@ -62,11 +62,7 @@
*
* TXFMURL := Class that takes an input URL to start of a transform pipe
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -77,7 +73,7 @@
#include <xercesc/util/XMLNetAccessor.hpp>
-//#include <util/NetAccessors/libWWW/BinURLInputStream.hpp>
+XERCES_CPP_NAMESPACE_USE
// General includes
1.8 +6 -7 xml-security/c/src/transformers/TXFMURL.hpp
Index: TXFMURL.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMURL.hpp 5 Jul 2003 10:30:36 -0000 1.7
+++ TXFMURL.hpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -62,8 +62,6 @@
*
* TXFMURL := Class that takes an input URL to start of a transform pipe
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -85,14 +83,15 @@
private:
XSECURIResolver * mp_resolver; // Resolver passed in
- BinInputStream * is; // To handle the actual input
+ XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
+ * is; // To handle the actual input
bool done;
public:
- TXFMURL(DOMDocument *doc, XSECURIResolver * resolver);
+ TXFMURL(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XSECURIResolver * resolver);
~TXFMURL();
// Methods to set the inputs
@@ -109,8 +108,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private :
1.10 +3 -3 xml-security/c/src/transformers/TXFMXPath.cpp
Index: TXFMXPath.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPath.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TXFMXPath.cpp 5 Aug 2003 11:36:09 -0000 1.9
+++ TXFMXPath.cpp 11 Sep 2003 11:11:29 -0000 1.10
@@ -62,8 +62,6 @@
*
* TXFMXPath := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -102,6 +100,8 @@
XALAN_USING_XALAN(XSLException)
#endif
+
+XERCES_CPP_NAMESPACE_USE
#if !defined(XSEC_NO_XPATH)
1.8 +9 -11 xml-security/c/src/transformers/TXFMXPath.hpp
Index: TXFMXPath.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPath.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMXPath.hpp 5 Aug 2003 11:36:09 -0000 1.7
+++ TXFMXPath.hpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -62,8 +62,6 @@
*
* TXFMXPath := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -111,8 +109,8 @@
safeBuffer expr; // The expression being worked with
- DOMDocument * document;
- DOMNamedNodeMap * XPathAtts; // Attributes that came through from the doc
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * document;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap * XPathAtts; // Attributes that came through from the doc
static bool XPathInitDone;
@@ -121,7 +119,7 @@
public:
- TXFMXPath(DOMDocument *doc);
+ TXFMXPath(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMXPath();
// Methods to set the inputs
@@ -136,15 +134,15 @@
// XPath unique
- void setNameSpace(DOMNamedNodeMap *xpAtts);
- void evaluateExpr(DOMNode *h, safeBuffer expr);
- void evaluateEnvelope(DOMNode *t);
+ void setNameSpace(XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap *xpAtts);
+ void evaluateExpr(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *h, safeBuffer expr);
+ void evaluateEnvelope(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *t);
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
virtual XSECXPathNodeList & getXPathNodeList();
private:
1.7 +2 -4 xml-security/c/src/transformers/TXFMXPathFilter.cpp
Index: TXFMXPathFilter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPathFilter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMXPathFilter.cpp 5 Aug 2003 11:36:09 -0000 1.6
+++ TXFMXPathFilter.cpp 11 Sep 2003 11:11:29 -0000 1.7
@@ -62,8 +62,6 @@
*
* TXFMXPathFilter := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -79,7 +77,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
#ifndef XSEC_NO_XALAN
1.4 +13 -12 xml-security/c/src/transformers/TXFMXPathFilter.hpp
Index: TXFMXPathFilter.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPathFilter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TXFMXPathFilter.hpp 5 Jul 2003 10:30:36 -0000 1.3
+++ TXFMXPathFilter.hpp 11 Sep 2003 11:11:29 -0000 1.4
@@ -62,8 +62,6 @@
*
* TXFMXPath := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -88,7 +86,8 @@
XSECXPathNodeList * lst;
xpathFilterType type;
- DOMNode * ancestorInScope;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * ancestorInScope;
};
@@ -105,7 +104,7 @@
public:
- TXFMXPathFilter(DOMDocument *doc);
+ TXFMXPathFilter(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMXPathFilter();
// Methods to set the inputs
@@ -126,8 +125,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
virtual XSECXPathNodeList & getXPathNodeList();
@@ -135,19 +134,21 @@
typedef std::vector<filterSetHolder *> lstsVectorType;
TXFMXPathFilter();
- void walkDocument(DOMNode * n);
- bool checkNodeInScope(DOMNode * n);
- bool checkNodeInInput(DOMNode * n);
+ void walkDocument(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * n);
+ bool checkNodeInScope(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * n);
+ bool checkNodeInInput(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * n);
- DOMDocument * document;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * document;
XSECXPathNodeList m_xpathFilterMap;
lstsVectorType m_lsts;
XSECSafeBufferFormatter * mp_formatter;
/* Used to hold details during tree-walk */
- DOMNode * mp_fragment;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_fragment;
XSECXPathNodeList * mp_inputList;
};
1.8 +2 -6 xml-security/c/src/transformers/TXFMXSL.cpp
Index: TXFMXSL.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TXFMXSL.cpp 5 Jul 2003 10:30:36 -0000 1.7
+++ TXFMXSL.cpp 11 Sep 2003 11:11:29 -0000 1.8
@@ -62,8 +62,6 @@
*
* TXFMXSL := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -82,9 +80,7 @@
#include <xercesc/framework/MemBufInputSource.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(MemBufInputSource);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
#include <iostream>
#include <strstream>
1.9 +8 -8 xml-security/c/src/transformers/TXFMXSL.hpp
Index: TXFMXSL.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TXFMXSL.hpp 5 Aug 2003 11:36:09 -0000 1.8
+++ TXFMXSL.hpp 11 Sep 2003 11:11:29 -0000 1.9
@@ -62,8 +62,6 @@
*
* TXFMXSL := Class that performs XML Stylesheet Language transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -114,13 +112,15 @@
safeBuffer sbInDoc;
- DOMDocument * document;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * document;
- DOMDocument * docOut; // The output from the transformation
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * docOut; // The output from the transformation
public:
- TXFMXSL(DOMDocument *doc);
+ TXFMXSL(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc);
~TXFMXSL();
// Methods to set the inputs
@@ -146,8 +146,8 @@
// Methods to get output data
virtual unsigned int readBytes(XMLByte * const toFill, const unsigned int maxToFill);
- virtual DOMDocument *getDocument();
- virtual DOMNode *getFragmentNode();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *getDocument();
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getFragmentNode();
virtual const XMLCh * getFragmentId();
private: