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:13:37 UTC
cvs commit: xml-security/c/src/dsig DSIGKeyInfo.hpp DSIGKeyInfoList.cpp DSIGKeyInfoList.hpp DSIGKeyInfoMgmtData.cpp DSIGKeyInfoMgmtData.hpp DSIGKeyInfoName.cpp DSIGKeyInfoName.hpp DSIGKeyInfoPGPData.cpp DSIGKeyInfoPGPData.hpp DSIGKeyInfoSPKIData.cpp DSIGKeyInfoSPKIData.hpp DSIGKeyInfoValue.cpp DSIGKeyInfoValue.hpp DSIGKeyInfoX509.cpp DSIGKeyInfoX509.hpp DSIGReference.cpp DSIGReference.hpp DSIGReferenceList.cpp DSIGReferenceList.hpp DSIGSignature.cpp DSIGSignature.hpp DSIGSignedInfo.cpp DSIGSignedInfo.hpp DSIGTransform.cpp DSIGTransform.hpp DSIGTransformBase64.cpp DSIGTransformBase64.hpp DSIGTransformC14n.cpp DSIGTransformC14n.hpp DSIGTransformEnvelope.cpp DSIGTransformEnvelope.hpp DSIGTransformList.cpp DSIGTransformXPath.cpp DSIGTransformXPath.hpp DSIGTransformXPathFilter.cpp DSIGTransformXPathFilter.hpp DSIGTransformXSL.cpp DSIGTransformXSL.hpp DSIGXPathFilterExpr.cpp DSIGXPathFilterExpr.hpp DSIGXPathHere.cpp DSIGXPathHere.hpp
blautenb 2003/09/11 04:13:37
Modified: c/src/dsig DSIGKeyInfo.hpp DSIGKeyInfoList.cpp
DSIGKeyInfoList.hpp DSIGKeyInfoMgmtData.cpp
DSIGKeyInfoMgmtData.hpp DSIGKeyInfoName.cpp
DSIGKeyInfoName.hpp DSIGKeyInfoPGPData.cpp
DSIGKeyInfoPGPData.hpp DSIGKeyInfoSPKIData.cpp
DSIGKeyInfoSPKIData.hpp DSIGKeyInfoValue.cpp
DSIGKeyInfoValue.hpp DSIGKeyInfoX509.cpp
DSIGKeyInfoX509.hpp DSIGReference.cpp
DSIGReference.hpp DSIGReferenceList.cpp
DSIGReferenceList.hpp DSIGSignature.cpp
DSIGSignature.hpp DSIGSignedInfo.cpp
DSIGSignedInfo.hpp DSIGTransform.cpp
DSIGTransform.hpp DSIGTransformBase64.cpp
DSIGTransformBase64.hpp DSIGTransformC14n.cpp
DSIGTransformC14n.hpp DSIGTransformEnvelope.cpp
DSIGTransformEnvelope.hpp DSIGTransformList.cpp
DSIGTransformXPath.cpp DSIGTransformXPath.hpp
DSIGTransformXPathFilter.cpp
DSIGTransformXPathFilter.hpp DSIGTransformXSL.cpp
DSIGTransformXSL.hpp DSIGXPathFilterExpr.cpp
DSIGXPathFilterExpr.hpp DSIGXPathHere.cpp
DSIGXPathHere.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace in headers
Revision Changes Path
1.7 +5 -4 xml-security/c/src/dsig/DSIGKeyInfo.hpp
Index: DSIGKeyInfo.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfo.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGKeyInfo.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGKeyInfo.hpp 11 Sep 2003 11:13:35 -0000 1.7
@@ -164,7 +164,8 @@
* \brief Return the DOMNode that heads up this DOMNode
*/
- virtual const DOMNode *getKeyInfoDOMNode() {return mp_keyInfoDOMNode;}
+ virtual const XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getKeyInfoDOMNode()
+ {return mp_keyInfoDOMNode;}
/**
* \brief Return the name of this key
@@ -195,8 +196,8 @@
protected:
- DOMNode * mp_keyInfoDOMNode;
- DSIGSignature * mp_parentSignature;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_keyInfoDOMNode;
+ DSIGSignature * mp_parentSignature;
private:
DSIGKeyInfo();
1.9 +3 -1 xml-security/c/src/dsig/DSIGKeyInfoList.cpp
Index: DSIGKeyInfoList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoList.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DSIGKeyInfoList.cpp 5 Jul 2003 10:30:30 -0000 1.8
+++ DSIGKeyInfoList.cpp 11 Sep 2003 11:13:35 -0000 1.9
@@ -80,6 +80,8 @@
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+XERCES_CPP_NAMESPACE_USE
+
DSIGKeyInfoList::DSIGKeyInfoList(DSIGSignature * sig) :
mp_parentSignature(sig) {}
1.4 +2 -7 xml-security/c/src/dsig/DSIGKeyInfoList.hpp
Index: DSIGKeyInfoList.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoList.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGKeyInfoList.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGKeyInfoList.hpp 11 Sep 2003 11:13:35 -0000 1.4
@@ -62,12 +62,7 @@
*
* DSIGKeyInfoList := Class for Loading and storing a list of KeyInfo elements
*
- *
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -191,7 +186,7 @@
* @returns true if successfully loaded
*/
- bool addXMLKeyInfo(DOMNode *ki);
+ bool addXMLKeyInfo(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *ki);
/*
* \brief Remove a KeyInfo from the list
1.3 +2 -2 xml-security/c/src/dsig/DSIGKeyInfoMgmtData.cpp
Index: DSIGKeyInfoMgmtData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoMgmtData.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSIGKeyInfoMgmtData.cpp 5 Jul 2003 10:30:30 -0000 1.2
+++ DSIGKeyInfoMgmtData.cpp 11 Sep 2003 11:13:35 -0000 1.3
@@ -75,7 +75,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.4 +5 -4 xml-security/c/src/dsig/DSIGKeyInfoMgmtData.hpp
Index: DSIGKeyInfoMgmtData.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoMgmtData.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGKeyInfoMgmtData.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGKeyInfoMgmtData.hpp 11 Sep 2003 11:13:35 -0000 1.4
@@ -109,7 +109,7 @@
* @param nameNode DOMNode to load information from
*/
- DSIGKeyInfoMgmtData(DSIGSignature * sig, DOMNode *nameNode);
+ DSIGKeyInfoMgmtData(DSIGSignature * sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *nameNode);
/**
* \brief Constructor used when XML needs to be created.
@@ -171,7 +171,7 @@
* @returns The newly created DOMElement with the structure underneath.
*/
- DOMElement * createBlankMgmtData(const XMLCh * data);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankMgmtData(const XMLCh * data);
/**
* \brief Set the value of the MgmtData to a new string.
@@ -201,7 +201,8 @@
DSIGKeyInfoMgmtData(); // Non-implemented constructor
const XMLCh * mp_data; // The Data stored in the XML file
- DOMNode * mp_dataTextNode; // Text node containing the name
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_dataTextNode; // Text node containing the name
};
1.5 +2 -2 xml-security/c/src/dsig/DSIGKeyInfoName.cpp
Index: DSIGKeyInfoName.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoName.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGKeyInfoName.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGKeyInfoName.cpp 11 Sep 2003 11:13:35 -0000 1.5
@@ -76,7 +76,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.6 +5 -8 xml-security/c/src/dsig/DSIGKeyInfoName.hpp
Index: DSIGKeyInfoName.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoName.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGKeyInfoName.hpp 5 Jul 2003 10:30:30 -0000 1.5
+++ DSIGKeyInfoName.hpp 11 Sep 2003 11:13:35 -0000 1.6
@@ -63,11 +63,7 @@
* DSIGKeyInfoX509 := A "Super" key that defines a certificate with a sub-key that defines
* the signing key
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -112,7 +108,7 @@
* @param nameNode DOMNode to load information from
*/
- DSIGKeyInfoName(DSIGSignature * sig, DOMNode *nameNode);
+ DSIGKeyInfoName(DSIGSignature * sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *nameNode);
/**
* \brief Constructor used when XML needs to be created.
@@ -181,7 +177,7 @@
* @returns The newly created DOMElement with the structure underneath.
*/
- DOMElement * createBlankKeyName(const XMLCh * name, bool isDName = false);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankKeyName(const XMLCh * name, bool isDName = false);
/**
* \brief Set the value of the KeyName to a new string.
@@ -214,7 +210,8 @@
const XMLCh * mp_name; // The Data stored in the XML file
XMLCh * mp_decodedDName; // When this is a DName that needs decoding
- DOMNode * mp_keyNameTextNode; // Text node containing the name
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_keyNameTextNode; // Text node containing the name
};
1.3 +2 -2 xml-security/c/src/dsig/DSIGKeyInfoPGPData.cpp
Index: DSIGKeyInfoPGPData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoPGPData.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSIGKeyInfoPGPData.cpp 5 Jul 2003 10:30:30 -0000 1.2
+++ DSIGKeyInfoPGPData.cpp 11 Sep 2003 11:13:36 -0000 1.3
@@ -76,7 +76,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.4 +9 -5 xml-security/c/src/dsig/DSIGKeyInfoPGPData.hpp
Index: DSIGKeyInfoPGPData.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoPGPData.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGKeyInfoPGPData.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGKeyInfoPGPData.hpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -109,7 +109,8 @@
* @param pgpDataNode DOMNode to load information from
*/
- DSIGKeyInfoPGPData(DSIGSignature * sig, DOMNode *pgpDataNode);
+ DSIGKeyInfoPGPData(DSIGSignature * sig,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *pgpDataNode);
/**
* \brief Constructor used when XML needs to be created.
@@ -184,7 +185,8 @@
* @returns The newly created DOMElement with the structure underneath.
*/
- DOMElement * createBlankPGPData(const XMLCh * id, const XMLCh * packet);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankPGPData(const XMLCh * id, const XMLCh * packet);
/**
* \brief Set the value of the KeyID to a new string.
@@ -225,8 +227,10 @@
const XMLCh * mp_keyID; // Key ID (from DOM)
const XMLCh * mp_keyPacket; // key Packet (from DOM)
- DOMNode * mp_keyIDTextNode; // Text node containing the ID
- DOMNode * mp_keyPacketTextNode; // Text node contianing key packet
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_keyIDTextNode; // Text node containing the ID
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_keyPacketTextNode; // Text node contianing key packet
};
1.4 +2 -2 xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp
Index: DSIGKeyInfoSPKIData.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoSPKIData.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGKeyInfoSPKIData.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGKeyInfoSPKIData.cpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -74,7 +74,7 @@
#include <xercesc/dom/DOM.hpp>
-XSEC_USING_XERCES(DOMDocument);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.5 +7 -4 xml-security/c/src/dsig/DSIGKeyInfoSPKIData.hpp
Index: DSIGKeyInfoSPKIData.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoSPKIData.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGKeyInfoSPKIData.hpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGKeyInfoSPKIData.hpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -110,7 +110,8 @@
* @param nameNode DOMNode to load information from
*/
- DSIGKeyInfoSPKIData(DSIGSignature * sig, DOMNode *nameNode);
+ DSIGKeyInfoSPKIData(DSIGSignature * sig,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *nameNode);
/**
* \brief Constructor used when XML needs to be created.
@@ -185,7 +186,8 @@
* @returns The newly created DOMElement with the structure underneath.
*/
- DOMElement * createBlankSPKIData(const XMLCh * Sexp);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankSPKIData(const XMLCh * Sexp);
/**
* \brief Append a new SPKISexp element to the SPKIData nodes
@@ -217,7 +219,8 @@
struct SexpNode {
const XMLCh * mp_expr;
- DOMNode * mp_exprTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_exprTextNode;
};
typedef std::vector<SexpNode *> sexpVectorType;
1.4 +3 -5 xml-security/c/src/dsig/DSIGKeyInfoValue.cpp
Index: DSIGKeyInfoValue.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoValue.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGKeyInfoValue.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGKeyInfoValue.cpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -62,11 +62,7 @@
*
* DSIGKeyInfoValue := A value setting
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -75,6 +71,8 @@
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+
+XERCES_CPP_NAMESPACE_USE
DSIGKeyInfoValue::DSIGKeyInfoValue(DSIGSignature * sig, DOMNode *valueNode) :
DSIGKeyInfo(sig),
1.7 +19 -14 xml-security/c/src/dsig/DSIGKeyInfoValue.hpp
Index: DSIGKeyInfoValue.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoValue.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGKeyInfoValue.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGKeyInfoValue.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -120,7 +120,10 @@
* @param valueNode DOMNode at head of XML structure
*/
- DSIGKeyInfoValue(DSIGSignature * sig, DOMNode *valueNode);
+ DSIGKeyInfoValue(
+ DSIGSignature * sig,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *valueNode
+ );
/**
* \brief Constructor for creating from scratch
@@ -215,10 +218,11 @@
* @returns the DOMElement at the head of the DOM structure
*/
- DOMElement * createBlankDSAKeyValue(const XMLCh * P,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankDSAKeyValue(const XMLCh * P,
const XMLCh * Q,
const XMLCh * G,
- const XMLCh * Y);
+ const XMLCh * Y
+ );
/**
* \brief Set P value.
@@ -271,8 +275,9 @@
* @returns The DOM structure of the RSAValue that has been created
*/
- DOMElement * DSIGKeyInfoValue::createBlankRSAKeyValue(const XMLCh * modulus,
- const XMLCh * exponent);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ DSIGKeyInfoValue::createBlankRSAKeyValue(const XMLCh * modulus,
+ const XMLCh * exponent);
/**
* \brief Set the Modulus
@@ -323,20 +328,20 @@
// DSA
- DOMNode * mp_PTextNode; // Nodes where strings are stored
- DOMNode * mp_QTextNode;
- DOMNode * mp_GTextNode;
- DOMNode * mp_YTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_PTextNode; // Nodes where strings are stored
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_QTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_GTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_YTextNode;
// RSA
- DOMNode * mp_modulusTextNode;
- DOMNode * mp_exponentTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_modulusTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_exponentTextNode;
// General
- DOMNode * mp_valueNode;
- keyInfoType m_keyInfoType;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_valueNode;
+ keyInfoType m_keyInfoType;
};
#endif /* #define DSIGKEYVALUE_INCLUDE */
1.8 +2 -4 xml-security/c/src/dsig/DSIGKeyInfoX509.cpp
Index: DSIGKeyInfoX509.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoX509.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSIGKeyInfoX509.cpp 5 Jul 2003 10:30:30 -0000 1.7
+++ DSIGKeyInfoX509.cpp 11 Sep 2003 11:13:36 -0000 1.8
@@ -63,8 +63,6 @@
* DSIGKeyX509 := A "Super" key that defines a certificate with a sub-key that defines
* the signing key
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -77,7 +75,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.7 +9 -11 xml-security/c/src/dsig/DSIGKeyInfoX509.hpp
Index: DSIGKeyInfoX509.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoX509.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGKeyInfoX509.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGKeyInfoX509.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -63,11 +63,8 @@
* DSIGKeyInfoX509 := A "Super" key that defines a certificate with a sub-key that defines
* the signing key
*
- * Author(s): Berin Lautenbach
+ * $Id$
*
- * $ID$
- *
- * $LOG$ *
*/
#ifndef DSIGKEYINFOX509_INCLUDE
@@ -132,7 +129,7 @@
* @param X509Data DOMNode at start of data
*/
- DSIGKeyInfoX509(DSIGSignature * sig, DOMNode *X509Data);
+ DSIGKeyInfoX509(DSIGSignature * sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *X509Data);
/**
* \brief Constructor called when building XML structures
@@ -290,7 +287,8 @@
* @returns A pointer to the new X509Data element.
*/
- DOMElement * createBlankX509Data(void);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankX509Data(void);
/**
* \brief Set the X509SubjectName element in the KeyInfo element.
@@ -389,11 +387,11 @@
// Text nodes holding information
- DOMNode * mp_X509SubjectNameTextNode;
- DOMNode * mp_X509IssuerNameTextNode;
- DOMNode * mp_X509SerialNumberTextNode;
- DOMNode * mp_X509CRLTextNode;
- DOMNode * mp_X509SKITextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_X509SubjectNameTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_X509IssuerNameTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_X509SerialNumberTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_X509CRLTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_X509SKITextNode;
};
1.14 +2 -4 xml-security/c/src/dsig/DSIGReference.cpp
Index: DSIGReference.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DSIGReference.cpp 28 Jul 2003 12:52:43 -0000 1.13
+++ DSIGReference.cpp 11 Sep 2003 11:13:36 -0000 1.14
@@ -62,8 +62,6 @@
*
* DSIG_Reference := Class for handling a DSIG reference element
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -104,7 +102,7 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
#include <iostream>
1.11 +17 -10 xml-security/c/src/dsig/DSIGReference.hpp
Index: DSIGReference.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DSIGReference.hpp 5 Jul 2003 10:30:30 -0000 1.10
+++ DSIGReference.hpp 11 Sep 2003 11:13:36 -0000 1.11
@@ -134,7 +134,7 @@
* @see DSIGSignature#createReference
*/
- DSIGReference(DSIGSignature * sig, DOMNode *dom);
+ DSIGReference(DSIGSignature * sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *dom);
/**
* \brief Contructor for use when creating new Reference structures.
@@ -197,7 +197,8 @@
* @returns The root Reference element of the newly created DOM structure.
*/
- DOMElement * createBlankReference(const XMLCh * URI, hashMethod hm, char * type);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankReference(const XMLCh * URI, hashMethod hm, char * type);
/**
* \brief Append an Enveloped Signature Transform to the Reference.
@@ -254,7 +255,7 @@
* @returns The newly create XSLT transform
*/
- DSIGTransformXSL * appendXSLTransform(DOMNode *stylesheet);
+ DSIGTransformXSL * appendXSLTransform(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *stylesheet);
/**
* \brief Append a Canonicalization Transform to the Reference.
@@ -447,7 +448,7 @@
*/
static DSIGTransformList * loadTransforms(
- DOMNode *transformsNode,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *transformsNode,
XSECSafeBufferFormatter * formatter,
DSIGSignature * sig);
@@ -464,7 +465,7 @@
* @returns A base TXFM element.
*/
- static TXFMBase * getURIBaseTXFM(DOMDocument * doc,
+ static TXFMBase * getURIBaseTXFM(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
const XMLCh * URI,
XSECURIResolver * resolver);
@@ -482,7 +483,7 @@
*/
static DSIGReferenceList *loadReferenceListFromXML(DSIGSignature * sig,
- DOMNode *firstReference);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *firstReference);
/**
* \brief Validate a list of references.
@@ -520,19 +521,25 @@
// Internal functions
void createTransformList(void);
- void addTransform(DSIGTransform * txfm, DOMElement * txfmElt);
+ void addTransform(
+ DSIGTransform * txfm,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * txfmElt
+ );
XSECSafeBufferFormatter * mp_formatter;
bool formatterLocal;
- DOMNode * mp_referenceNode; // Points to start of document where reference node is
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_referenceNode; // Points to start of document where reference node is
TXFMBase * mp_preHash; // To be used pre-hash
DSIGReferenceList * mp_manifestList; // The list of references in a manifest
const XMLCh * mp_URI; // The URI String
bool m_isManifest; // Does this reference a manifest?
- DOMNode * mp_transformsNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_transformsNode;
hashMethod me_hashMethod; // What form of digest?
- DOMNode * mp_hashValueNode; // Node where the Hash value is stored
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_hashValueNode; // Node where the Hash value is stored
DSIGSignature * mp_parentSignature; // Owner signature
DSIGTransformList * mp_transformList; // List of transforms
1.5 +3 -3 xml-security/c/src/dsig/DSIGReferenceList.cpp
Index: DSIGReferenceList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReferenceList.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGReferenceList.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGReferenceList.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,8 +62,6 @@
*
* DSIGReferenceList := Class for Loading and storing a list of references
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -71,6 +69,8 @@
// XSEC Includes
#include <xsec/dsig/DSIGReferenceList.hpp>
#include <xsec/dsig/DSIGReference.hpp>
+
+XERCES_CPP_NAMESPACE_USE
DSIGReferenceList::DSIGReferenceList() {}
1.5 +1 -3 xml-security/c/src/dsig/DSIGReferenceList.hpp
Index: DSIGReferenceList.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReferenceList.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGReferenceList.hpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGReferenceList.hpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,8 +62,6 @@
*
* DSIGReferenceList := Class for Loading and storing a list of references
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
1.22 +2 -3 xml-security/c/src/dsig/DSIGSignature.cpp
Index: DSIGSignature.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DSIGSignature.cpp 28 Jul 2003 12:52:43 -0000 1.21
+++ DSIGSignature.cpp 11 Sep 2003 11:13:36 -0000 1.22
@@ -99,8 +99,7 @@
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Some useful utility functions
1.15 +23 -11 xml-security/c/src/dsig/DSIGSignature.hpp
Index: DSIGSignature.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DSIGSignature.hpp 5 Jul 2003 10:30:30 -0000 1.14
+++ DSIGSignature.hpp 11 Sep 2003 11:13:36 -0000 1.15
@@ -129,7 +129,9 @@
* @see #load
*/
- DSIGSignature(DOMDocument *doc, DOMNode *sigNode);
+ DSIGSignature(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *sigNode);
+
~DSIGSignature();
//@}
@@ -319,10 +321,12 @@
* the document.
*/
- DOMElement *createBlankSignature(DOMDocument *doc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *createBlankSignature(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
canonicalizationMethod cm = CANON_C14N_NOC,
signatureMethod sm = SIGNATURE_DSA,
- hashMethod hm = HASH_SHA1);
+ hashMethod hm = HASH_SHA1
+ );
/**
* \brief Add a new reference to the end of the list of \<Reference\> nodes.
@@ -344,8 +348,11 @@
*/
- DSIGReference * createReference(const XMLCh * URI,
- hashMethod hm = HASH_SHA1, char * type = NULL);
+ DSIGReference * createReference(
+ const XMLCh * URI,
+ hashMethod hm = HASH_SHA1,
+ char * type = NULL
+ );
//@}
@@ -448,7 +455,8 @@
* @returns The DOM_Document node.
*/
- DOMDocument * getParentDocument() {return mp_doc;}
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * getParentDocument()
+ {return mp_doc;}
/**
* \brief Get canonicalisation algorithm
@@ -675,13 +683,17 @@
XSECSafeBufferFormatter * mp_formatter;
bool m_loaded; // Have we already loaded?
- DOMDocument * mp_doc;
- DOMNode * mp_sigNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * mp_doc;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_sigNode;
DSIGSignedInfo * mp_signedInfo;
- DOMNode * mp_signatureValueNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_signatureValueNode;
safeBuffer m_signatureValueSB;
DSIGKeyInfoList m_keyInfoList;
- DOMNode * mp_KeyInfoNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_KeyInfoNode;
safeBuffer m_errStr;
// For creating functions
1.6 +2 -7 xml-security/c/src/dsig/DSIGSignedInfo.cpp
Index: DSIGSignedInfo.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignedInfo.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGSignedInfo.cpp 5 Jul 2003 10:30:30 -0000 1.5
+++ DSIGSignedInfo.cpp 11 Sep 2003 11:13:36 -0000 1.6
@@ -62,11 +62,7 @@
*
* DSIGSignedInfo := Class for checking and setting up signed Info nodes in a DSIG signature
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -79,8 +75,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
// Constructors and Destructors
1.9 +13 -9 xml-security/c/src/dsig/DSIGSignedInfo.hpp
Index: DSIGSignedInfo.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignedInfo.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DSIGSignedInfo.hpp 5 Jul 2003 10:30:30 -0000 1.8
+++ DSIGSignedInfo.hpp 11 Sep 2003 11:13:36 -0000 1.9
@@ -124,9 +124,9 @@
* @param parentSignature The signature that owns me
*/
- DSIGSignedInfo(DOMDocument *doc,
+ DSIGSignedInfo(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
XSECSafeBufferFormatter * pFormatter,
- DOMNode *signedInfoNode,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *signedInfoNode,
DSIGSignature * parentSignature);
@@ -141,7 +141,7 @@
* @param parentSignature The owning Signature
*/
- DSIGSignedInfo(DOMDocument *doc,
+ DSIGSignedInfo(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
XSECSafeBufferFormatter * pFormatter,
DSIGSignature * parentSignature);
@@ -204,9 +204,11 @@
* @param hm Hash method to use (for the SignedInfo, not the references)
*/
- DOMElement *createBlankSignedInfo(canonicalizationMethod cm,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankSignedInfo(canonicalizationMethod cm,
signatureMethod sm,
- hashMethod hm);
+ hashMethod hm
+ );
/**
* \brief Create a reference to add to the SignedInfo
@@ -232,7 +234,7 @@
* @returns the SignedInfo node
*/
- DOMNode *getDOMNode(void);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *getDOMNode(void);
/**
* \brief Get the canonicalisation method
@@ -283,8 +285,10 @@
XSECSafeBufferFormatter * mp_formatter;
bool m_loaded; // Have we already loaded?
- DOMDocument * mp_doc;
- DOMNode * mp_signedInfoNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
+ * mp_doc;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_signedInfoNode;
canonicalizationMethod m_canonicalizationMethod;
signatureMethod m_signatureMethod;
hashMethod m_hashMethod;
1.4 +3 -5 xml-security/c/src/dsig/DSIGTransform.cpp
Index: DSIGTransform.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransform.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGTransform.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGTransform.cpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -62,16 +62,14 @@
*
* DSIGTransform := Base (virtual) class that defines a DSIG Transform
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
#include <xsec/dsig/DSIGTransform.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+
+XERCES_CPP_NAMESPACE_USE
DOMElement * DSIGTransform::createTransformNode() {
1.6 +7 -5 xml-security/c/src/dsig/DSIGTransform.hpp
Index: DSIGTransform.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransform.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGTransform.hpp 5 Jul 2003 10:30:30 -0000 1.5
+++ DSIGTransform.hpp 11 Sep 2003 11:13:36 -0000 1.6
@@ -123,7 +123,7 @@
* @see #load
*/
- DSIGTransform(DSIGSignature *sig, DOMNode * node) :
+ DSIGTransform(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node) :
mp_txfmNode(node),
mp_parentSignature(sig) {};
@@ -185,7 +185,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc) = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankTransform(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc) = 0;
/**
* \brief Load a DOM structure
@@ -209,10 +210,11 @@
*
*/
- DOMElement * createTransformNode();
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createTransformNode();
- DOMNode * mp_txfmNode; // The node that we read from
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_txfmNode; // The node that we read from
DSIGSignature * mp_parentSignature; // Owning signature
private:
1.5 +3 -3 xml-security/c/src/dsig/DSIGTransformBase64.cpp
Index: DSIGTransformBase64.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformBase64.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGTransformBase64.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGTransformBase64.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,8 +62,6 @@
*
* DSIGTransformBase64 := Class that holds a Base64 transform structure
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -79,6 +77,8 @@
#include <xsec/framework/XSECException.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.7 +4 -5 xml-security/c/src/dsig/DSIGTransformBase64.hpp
Index: DSIGTransformBase64.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformBase64.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGTransformBase64.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGTransformBase64.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -62,8 +62,6 @@
*
* DSIGTransformBase64 := Class that holds Base 64 Transform information
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -109,7 +107,7 @@
* @see #load
*/
- DSIGTransformBase64(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformBase64(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -166,7 +164,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankTransform(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
1.13 +2 -5 xml-security/c/src/dsig/DSIGTransformC14n.cpp
Index: DSIGTransformC14n.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DSIGTransformC14n.cpp 5 Jul 2003 10:30:30 -0000 1.12
+++ DSIGTransformC14n.cpp 11 Sep 2003 11:13:36 -0000 1.13
@@ -62,8 +62,6 @@
*
* DSIGTransformC14n := Class that performs C14n canonicalisation
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -77,8 +75,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.8 +6 -6 xml-security/c/src/dsig/DSIGTransformC14n.hpp
Index: DSIGTransformC14n.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSIGTransformC14n.hpp 5 Jul 2003 10:30:30 -0000 1.7
+++ DSIGTransformC14n.hpp 11 Sep 2003 11:13:36 -0000 1.8
@@ -62,8 +62,6 @@
*
* DSIGTransformC14n := Class that holds information about C14n transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -104,7 +102,7 @@
* @see #load
*/
- DSIGTransformC14n(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformC14n(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -163,7 +161,8 @@
* @note By default creates a non-comment non-exclusive C14n transform.
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankTransform(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
@@ -267,6 +266,7 @@
canonicalizationMethod m_cMethod; // The method
- DOMElement * mp_inclNSNode; // Node holding the inclusive Namespaces
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement
+ * mp_inclNSNode; // Node holding the inclusive Namespaces
const XMLCh * mp_inclNSStr; // String holding the namespaces
};
1.5 +3 -3 xml-security/c/src/dsig/DSIGTransformEnvelope.cpp
Index: DSIGTransformEnvelope.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformEnvelope.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGTransformEnvelope.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGTransformEnvelope.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,8 +62,6 @@
*
* DSIGTransformEnvelope := Class that calculates an Envelope with an XPath evaluator
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -79,6 +77,8 @@
#include <xsec/framework/XSECException.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.7 +4 -5 xml-security/c/src/dsig/DSIGTransformEnvelope.hpp
Index: DSIGTransformEnvelope.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformEnvelope.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGTransformEnvelope.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGTransformEnvelope.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -62,8 +62,6 @@
*
* DSIGTransformEnvelope := Class that holds an Envelope transform
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -107,7 +105,7 @@
* @see #load
*/
- DSIGTransformEnvelope(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformEnvelope(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -161,7 +159,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankTransform(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
1.5 +1 -5 xml-security/c/src/dsig/DSIGTransformList.cpp
Index: DSIGTransformList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformList.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGTransformList.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGTransformList.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,11 +62,7 @@
*
* DSIGTransformList := Class for Loading and storing a list of references
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
1.9 +2 -4 xml-security/c/src/dsig/DSIGTransformXPath.cpp
Index: DSIGTransformXPath.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXPath.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DSIGTransformXPath.cpp 5 Jul 2003 10:30:30 -0000 1.8
+++ DSIGTransformXPath.cpp 11 Sep 2003 11:13:36 -0000 1.9
@@ -62,8 +62,6 @@
*
* DSIGTransformXPath := Class that holds XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -79,7 +77,7 @@
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.7 +11 -9 xml-security/c/src/dsig/DSIGTransformXPath.hpp
Index: DSIGTransformXPath.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXPath.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGTransformXPath.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGTransformXPath.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -62,8 +62,6 @@
*
* DSIGTransformXPath := Class that performs XPath transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -111,7 +109,7 @@
* @see #load
*/
- DSIGTransformXPath(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformXPath(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -170,7 +168,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankTransform(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
@@ -233,7 +232,7 @@
* @returns A pointer to the NamedNodeMap
*/
- DOMNamedNodeMap * getNamespaces(void) {
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap * getNamespaces(void) {
return mp_NSMap;
}
@@ -257,9 +256,12 @@
DSIGTransformXPath(const DSIGTransformXPath & theOther);
safeBuffer m_expr;
- DOMNode * mp_exprTextNode;
- DOMNode * mp_xpathNode;
- DOMNamedNodeMap * mp_NSMap;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_exprTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_xpathNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap
+ * mp_NSMap;
};
1.4 +2 -2 xml-security/c/src/dsig/DSIGTransformXPathFilter.cpp
Index: DSIGTransformXPathFilter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXPathFilter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGTransformXPathFilter.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGTransformXPathFilter.cpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -78,7 +78,7 @@
#include <xercesc/dom/DOMNode.hpp>
-XSEC_USING_XERCES(DOMNode);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Construct/Destruct
1.4 +4 -5 xml-security/c/src/dsig/DSIGTransformXPathFilter.hpp
Index: DSIGTransformXPathFilter.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXPathFilter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGTransformXPathFilter.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGTransformXPathFilter.hpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -63,8 +63,6 @@
* DSIGTransformXPathFilter := Class that performs XPath Filter
* transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -123,7 +121,7 @@
* @see #load
*/
- DSIGTransformXPathFilter(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformXPathFilter(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -182,7 +180,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *
+ createBlankTransform(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
1.5 +3 -3 xml-security/c/src/dsig/DSIGTransformXSL.cpp
Index: DSIGTransformXSL.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXSL.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGTransformXSL.cpp 5 Jul 2003 10:30:30 -0000 1.4
+++ DSIGTransformXSL.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -62,8 +62,6 @@
*
* DSIGTransformXSL := Class that Handles DSIG XSLT Transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -78,6 +76,8 @@
#include <xsec/framework/XSECException.hpp>
#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
+
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Constructors and Destructors
1.7 +9 -8 xml-security/c/src/dsig/DSIGTransformXSL.hpp
Index: DSIGTransformXSL.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXSL.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSIGTransformXSL.hpp 5 Jul 2003 10:30:30 -0000 1.6
+++ DSIGTransformXSL.hpp 11 Sep 2003 11:13:36 -0000 1.7
@@ -62,8 +62,6 @@
*
* DSIGTransformXSL := Class that performs XML Stylesheet Language transforms
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -110,7 +108,7 @@
* @see #load
*/
- DSIGTransformXSL(DSIGSignature *sig, DOMNode * node);
+ DSIGTransformXSL(DSIGSignature *sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Contructor used for new signatures.
@@ -162,7 +160,8 @@
* transform and return the newly constructed DOMNode structure
*/
- virtual DOMElement * createBlankTransform(DOMDocument * parentDoc);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * createBlankTransform(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * parentDoc);
/**
* \brief Load a DOM structure
@@ -191,7 +190,9 @@
* to the caller who is expected to delete it.
*/
- DOMNode * setStylesheet(DOMNode * stylesheet);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * setStylesheet(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * stylesheet
+ );
/**
* \brief Get the stylesheet node.
@@ -202,7 +203,7 @@
* @returns The top stylesheet node
*/
- DOMNode * getStylesheet(void);
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * getStylesheet(void);
//@}
@@ -211,6 +212,6 @@
DSIGTransformXSL();
DSIGTransformXSL(const DSIGTransformXSL & theOther);
- DOMNode * mp_stylesheetNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_stylesheetNode;
};
1.5 +9 -11 xml-security/c/src/dsig/DSIGXPathFilterExpr.cpp
Index: DSIGXPathFilterExpr.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathFilterExpr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DSIGXPathFilterExpr.cpp 28 Jul 2003 12:52:04 -0000 1.4
+++ DSIGXPathFilterExpr.cpp 11 Sep 2003 11:13:36 -0000 1.5
@@ -79,19 +79,17 @@
#include <xercesc/util/XMLUniDefs.hpp>
-XSEC_USING_XERCES(DOMNamedNodeMap);
-XSEC_USING_XERCES(DOMNode);
-XSEC_USING_XERCES(DOMAttr);
+XERCES_CPP_NAMESPACE_USE
XMLCh filterStr[] = {
- XERCES_CPP_NAMESPACE :: chLatin_F,
- XERCES_CPP_NAMESPACE :: chLatin_i,
- XERCES_CPP_NAMESPACE :: chLatin_l,
- XERCES_CPP_NAMESPACE :: chLatin_t,
- XERCES_CPP_NAMESPACE :: chLatin_e,
- XERCES_CPP_NAMESPACE :: chLatin_r,
- XERCES_CPP_NAMESPACE :: chNull
+ chLatin_F,
+ chLatin_i,
+ chLatin_l,
+ chLatin_t,
+ chLatin_e,
+ chLatin_r,
+ chNull
};
1.4 +10 -9 xml-security/c/src/dsig/DSIGXPathFilterExpr.hpp
Index: DSIGXPathFilterExpr.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathFilterExpr.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGXPathFilterExpr.hpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGXPathFilterExpr.hpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -62,8 +62,6 @@
*
* DSIGXPathFilterExpr := Class that holds an XPath Filter expression
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -112,7 +110,7 @@
* @param node The node that will be used to read the expression in
*/
- DSIGXPathFilterExpr(DSIGSignature * sig, DOMNode * node);
+ DSIGXPathFilterExpr(DSIGSignature * sig, XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * node);
/**
* \brief Builder constructor
@@ -168,7 +166,7 @@
* @param filterExpr The XPath expression
*/
- DOMElement * setFilter(xpathFilterType filterType,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * setFilter(xpathFilterType filterType,
const XMLCh * filterExpr);
/**
@@ -203,7 +201,7 @@
* @returns A pointer to the NamedNodeMap
*/
- DOMNamedNodeMap * getNamespaces(void) {
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap * getNamespaces(void) {
return mp_NSMap;
}
@@ -231,9 +229,12 @@
DSIGXPathFilterExpr(const DSIGXPathFilterExpr& theOther);
DSIGSignature * mp_sig;
- DOMNode * mp_xpathFilterNode;
- DOMNode * mp_exprTextNode;
- DOMNamedNodeMap * mp_NSMap;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_xpathFilterNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
+ * mp_exprTextNode;
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap
+ * mp_NSMap;
safeBuffer m_expr;
xpathFilterType m_filterType;
bool m_loaded;
1.4 +1 -5 xml-security/c/src/dsig/DSIGXPathHere.cpp
Index: DSIGXPathHere.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathHere.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSIGXPathHere.cpp 5 Jul 2003 10:30:30 -0000 1.3
+++ DSIGXPathHere.cpp 11 Sep 2003 11:13:36 -0000 1.4
@@ -62,11 +62,7 @@
*
* DSIGXPathHere := Implementation of the "here()" XPath function.
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
1.6 +1 -5 xml-security/c/src/dsig/DSIGXPathHere.hpp
Index: DSIGXPathHere.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathHere.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DSIGXPathHere.hpp 5 Aug 2003 11:36:09 -0000 1.5
+++ DSIGXPathHere.hpp 11 Sep 2003 11:13:36 -0000 1.6
@@ -62,11 +62,7 @@
*
* DSIGXPathHere := Implementation of the "here()" XPath function.
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/