blautenb 2003/09/11 04:12:40
Modified: c/src/framework XSECDefs.hpp XSECProvider.cpp
XSECProvider.hpp XSECURIResolver.hpp
XSECURIResolverXerces.cpp XSECURIResolverXerces.hpp
XSECW32Config.hpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace
in headers
Revision Changes Path
1.8 +2 -3 xml-security/c/src/framework/XSECDefs.hpp
Index: XSECDefs.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECDefs.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSECDefs.hpp 5 Jul 2003 10:30:34 -0000 1.7
+++ XSECDefs.hpp 11 Sep 2003 11:12:39 -0000 1.8
@@ -109,8 +109,7 @@
#if defined(XERCES_HAS_CPP_NAMESPACE)
# define XSEC_USING_XERCES(NAME) using XERCES_CPP_NAMESPACE :: NAME
-# define XSEC_DECLARE_XERCES_CLASS(NAME) namespace XERCES_CPP_NAMESPACE {
class NAME; } \
-
using XERCES_CPP_NAMESPACE::NAME
+# define XSEC_DECLARE_XERCES_CLASS(NAME) namespace XERCES_CPP_NAMESPACE {
class NAME; }
# define XSEC_DECLARE_XERCES_STRUCT(NAME) namespace XERCES_CPP_NAMESPACE
{ struct NAME; }
#else
# define XERCES_CPP_NAMESPACE_QUALIFIER
1.7 +3 -3 xml-security/c/src/framework/XSECProvider.cpp
Index: XSECProvider.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECProvider.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECProvider.cpp 31 Aug 2003 12:50:47 -0000 1.6
+++ XSECProvider.cpp 11 Sep 2003 11:12:39 -0000 1.7
@@ -63,8 +63,6 @@
* XSECProvider.hpp := The main interface for users wishing to gain access
* to signature objects
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -75,6 +73,8 @@
#include <xsec/framework/XSECURIResolverXerces.hpp>
#include "../xenc/impl/XENCCipherImpl.hpp"
+
+XERCES_CPP_NAMESPACE_USE
//
--------------------------------------------------------------------------------
// Constructors/Destructors
1.8 +7 -4 xml-security/c/src/framework/XSECProvider.hpp
Index: XSECProvider.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECProvider.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSECProvider.hpp 31 Aug 2003 12:50:47 -0000 1.7
+++ XSECProvider.hpp 11 Sep 2003 11:12:39 -0000 1.8
@@ -148,7 +148,10 @@
* @see DSIGSignature#load
*/
- DSIGSignature * newSignatureFromDOM(DOMDocument *doc, DOMNode *sigNode);
+ DSIGSignature * newSignatureFromDOM(
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc,
+ XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *sigNode
+ );
/**
* \brief DSIGSignature creator for use with existing XML signatures or
templates.
@@ -166,7 +169,7 @@
* @see DSIGSignature#load
*/
- DSIGSignature * newSignatureFromDOM(DOMDocument *doc);
+ DSIGSignature * newSignatureFromDOM(XERCES_CPP_NAMESPACE_QUALIFIER
DOMDocument *doc);
/**
* \brief DSIGSignature creator for creating new XML signatures.
@@ -218,7 +221,7 @@
* @returns An implementation object for XENCCipher
*/
- XENCCipher * newCipher(DOMDocument * doc);
+ XENCCipher * newCipher(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *
doc);
/**
* \brief Method to delete XENCCipher objects created via this provider
1.6 +3 -7 xml-security/c/src/framework/XSECURIResolver.hpp
Index: XSECURIResolver.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolver.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECURIResolver.hpp 5 Jul 2003 10:30:34 -0000 1.5
+++ XSECURIResolver.hpp 11 Sep 2003 11:12:39 -0000 1.6
@@ -63,12 +63,7 @@
* XSECURIResolver := Virtual Interface class that takes a URI and
* creates a binary input stream from it.
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
- *
+ * $Id$
*/
#ifndef XSECURIRESOLVER_INCLUDE
@@ -133,7 +128,8 @@
* @returns The octet stream corresponding to the URI.
*/
- virtual BinInputStream * resolveURI(const XMLCh * uri) = 0;
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream *
+ resolveURI(const XMLCh * uri) = 0;
/**
* \brief Clone the resolver to be installed in a new object.
1.7 +2 -8 xml-security/c/src/framework/XSECURIResolverXerces.cpp
Index: XSECURIResolverXerces.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolverXerces.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECURIResolverXerces.cpp 28 Jul 2003 12:52:43 -0000 1.6
+++ XSECURIResolverXerces.cpp 11 Sep 2003 11:12:39 -0000 1.7
@@ -63,11 +63,7 @@
* XSECURIResolverXerces := Virtual Interface class that takes a URI and
* creates a binary input stream from it.
*
- * Author(s): Berin Lautenbach
- *
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -80,9 +76,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(Janitor);
-
+XERCES_CPP_NAMESPACE_USE
#include <string.h>
1.5 +2 -4 xml-security/c/src/framework/XSECURIResolverXerces.hpp
Index: XSECURIResolverXerces.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolverXerces.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECURIResolverXerces.hpp 5 Jul 2003 10:30:34 -0000 1.4
+++ XSECURIResolverXerces.hpp 11 Sep 2003 11:12:39 -0000 1.5
@@ -63,8 +63,6 @@
* XSECURIResolverXerces := Virtual Interface class that takes a URI and
* creates a binary input stream from it.
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -123,7 +121,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.
1.13 +8 -1 xml-security/c/src/framework/XSECW32Config.hpp
Index: XSECW32Config.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECW32Config.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSECW32Config.hpp 5 Jul 2003 10:30:34 -0000 1.12
+++ XSECW32Config.hpp 11 Sep 2003 11:12:39 -0000 1.13
@@ -88,6 +88,13 @@
* constructors
*/
# define XSEC_XERCES_FORMATTER_REQUIRES_VERSION 1
+
+ /* 2.3 and above use a user defined Memory Manager. In some cases, this
+ actually needs to be passed to functions
+*/
+
+# define XSEC_XERCES_REQUIRES_MEMMGR 1
+
#else
/*
* In version 2.2, the XMLUri class was broken for relative URI
de-referencing
