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:55 UTC
cvs commit: xml-security/c/src/tools/txfmout txfmout.cpp
blautenb 2003/09/11 04:11:55
Modified: c/src/tools/c14n c14n.cpp
c/src/tools/checksig AnonymousResolver.cpp
AnonymousResolver.hpp InteropResolver.cpp
checksig.cpp
c/src/tools/cipher cipher.cpp
c/src/tools/siginf siginf.cpp
c/src/tools/threadTest threadtest.cpp
c/src/tools/txfmout txfmout.cpp
Log:
Cleaned up usage of Xerces namespace - no longer inject into global namespace in headers
Revision Changes Path
1.6 +2 -8 xml-security/c/src/tools/c14n/c14n.cpp
Index: c14n.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/c14n/c14n.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- c14n.cpp 9 Aug 2003 10:09:27 -0000 1.5
+++ c14n.cpp 11 Sep 2003 11:11:55 -0000 1.6
@@ -63,8 +63,6 @@
* c14n := tool to dump a XML file to the console after canonacalising it thru
* c14n
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -93,11 +91,7 @@
#include <xsec/utils/XSECNameSpaceExpander.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(DOMException);
+XERCES_CPP_NAMESPACE_USE
using std::endl;
using std::cout;
1.3 +2 -3 xml-security/c/src/tools/checksig/AnonymousResolver.cpp
Index: AnonymousResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/AnonymousResolver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnonymousResolver.cpp 5 Jul 2003 10:30:35 -0000 1.2
+++ AnonymousResolver.cpp 11 Sep 2003 11:11:55 -0000 1.3
@@ -79,8 +79,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/framework/URLInputSource.hpp>
-XSEC_USING_XERCES(XMLString);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
// ----------------------------------------------------------------------------
1.3 +2 -2 xml-security/c/src/tools/checksig/AnonymousResolver.hpp
Index: AnonymousResolver.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/AnonymousResolver.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnonymousResolver.hpp 5 Jul 2003 10:30:35 -0000 1.2
+++ AnonymousResolver.hpp 11 Sep 2003 11:11:55 -0000 1.3
@@ -97,7 +97,7 @@
// Interface method
- virtual BinInputStream * resolveURI(const XMLCh * uri);
+ virtual XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream * resolveURI(const XMLCh * uri);
// Interface method
1.6 +2 -4 xml-security/c/src/tools/checksig/InteropResolver.cpp
Index: InteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropResolver.cpp 5 Jul 2003 10:30:35 -0000 1.5
+++ InteropResolver.cpp 11 Sep 2003 11:11:55 -0000 1.6
@@ -63,8 +63,6 @@
* InteropResolver := Class to resolve key elements into certificates for
* merlin-18 interop test
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -85,7 +83,7 @@
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-XSEC_USING_XERCES(ArrayJanitor);
+XERCES_CPP_NAMESPACE_USE
#include <iostream>
1.23 +2 -9 xml-security/c/src/tools/checksig/checksig.cpp
Index: checksig.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/checksig.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- checksig.cpp 5 Aug 2003 11:36:09 -0000 1.22
+++ checksig.cpp 11 Sep 2003 11:11:55 -0000 1.23
@@ -62,8 +62,6 @@
*
* checkSig := (Very ugly) tool to check a signature embedded in an XML file
*
- * Author(s): Berin Lautenbach
- *
* $Id$
*
*/
@@ -120,12 +118,7 @@
#include <xercesc/util/XMLUri.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(DOMException);
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
using std::cerr;
using std::cout;
1.2 +2 -13 xml-security/c/src/tools/cipher/cipher.cpp
Index: cipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/cipher.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cipher.cpp 31 Aug 2003 12:45:16 -0000 1.1
+++ cipher.cpp 11 Sep 2003 11:11:55 -0000 1.2
@@ -117,18 +117,7 @@
#include <xercesc/framework/XMLFormatter.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(DOMImplementationLS);
-XSEC_USING_XERCES(DOMImplementationRegistry);
-XSEC_USING_XERCES(DOMImplementation);
-XSEC_USING_XERCES(DOMWriter);
-XSEC_USING_XERCES(StdOutFormatTarget);
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(DOMException);
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(XMLUni);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
using std::cerr;
using std::cout;
1.7 +2 -7 xml-security/c/src/tools/siginf/siginf.cpp
Index: siginf.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/siginf/siginf.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- siginf.cpp 5 Aug 2003 11:36:09 -0000 1.6
+++ siginf.cpp 11 Sep 2003 11:11:55 -0000 1.7
@@ -111,12 +111,7 @@
#include <xercesc/util/XMLUri.hpp>
#include <xercesc/util/Janitor.hpp>
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(DOMException);
-XSEC_USING_XERCES(XMLUri);
-XSEC_USING_XERCES(Janitor);
+XERCES_CPP_NAMESPACE_USE
using std::cerr;
using std::cout;
1.5 +1 -13 xml-security/c/src/tools/threadTest/threadtest.cpp
Index: threadtest.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/threadTest/threadtest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- threadtest.cpp 5 Jul 2003 10:30:35 -0000 1.4
+++ threadtest.cpp 11 Sep 2003 11:11:55 -0000 1.5
@@ -103,19 +103,7 @@
using std::vector;
using std::ostrstream;
-XSEC_USING_XERCES(XMLMutex);
-XSEC_USING_XERCES(DOMImplementation);
-XSEC_USING_XERCES(DOMImplementationLS);
-XSEC_USING_XERCES(DOMWriter);
-XSEC_USING_XERCES(XMLUni);
-XSEC_USING_XERCES(StdOutFormatTarget);
-XSEC_USING_XERCES(MemBufFormatTarget);
-XSEC_USING_XERCES(MemBufInputSource);
-XSEC_USING_XERCES(DOMText);
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(DOMImplementationRegistry);
+XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
// Globals used and read by all threads
1.12 +2 -7 xml-security/c/src/tools/txfmout/txfmout.cpp
Index: txfmout.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/txfmout/txfmout.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- txfmout.cpp 5 Aug 2003 11:36:09 -0000 1.11
+++ txfmout.cpp 11 Sep 2003 11:11:55 -0000 1.12
@@ -114,12 +114,7 @@
#include <xercesc/util/XMLNetAccessor.hpp>
#include <xercesc/util/XMLUri.hpp>
-XSEC_USING_XERCES(NetAccessorException);
-XSEC_USING_XERCES(DOMException);
-XSEC_USING_XERCES(XMLException);
-XSEC_USING_XERCES(XercesDOMParser);
-XSEC_USING_XERCES(XMLPlatformUtils);
-XSEC_USING_XERCES(XMLUri);
+XERCES_CPP_NAMESPACE_USE
using std::ios;
using std::cout;