You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2017/08/31 00:02:23 UTC
svn commit: r1806748 - in /santuario/xml-security-cpp/trunk: ./
xsec/framework/ xsec/utils/ xsec/utils/unixutils/ xsec/utils/winutils/
Author: scantor
Date: Thu Aug 31 00:02:22 2017
New Revision: 1806748
URL: http://svn.apache.org/viewvc?rev=1806748&view=rev
Log:
Assume Xerces 3 - remove XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in
santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp
santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp
santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp
santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Thu Aug 31 00:02:22 2017
@@ -129,15 +129,6 @@ CXXFLAGS="${CXXFLAGS} -DXSEC_LIBRARY_BUI
# Find out some properties of the version of Xerces we have
-AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/BinMemInputStream.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
- XMLByte buf[1024];
- BinMemInputStream in(buf,1024);
- in.getContentType();
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE],[1],[Define to 1 if Xerces InputStream class requires getContentType.])],
- [AC_MSG_RESULT([no])])
-
AC_MSG_CHECKING([whether Xerces XMLFormatter requires a version])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/framework/XMLFormatter.hpp>
#include <xercesc/util/XercesDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in Thu Aug 31 00:02:22 2017
@@ -48,9 +48,6 @@
/* Define to 1 if Xerces XMLFormatter requires version. */
#undef XSEC_XERCES_FORMATTER_REQUIRES_VERSION
-/* Define to 1 if Xerces InputStream class requires getContentType. */
-#undef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
-
/* Define to 1 if Xerces XMLFormatter requires MemoryManager. */
#undef XSEC_XERCES_REQUIRES_MEMMGR
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Thu Aug 31 00:02:22 2017
@@ -37,13 +37,6 @@
* numbers to understand library idiosycracies
*/
-#if (XERCES_VERSION_MAJOR >= 3)
-
-/* 3.0 InputStream must expose content type */
-
-# define XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE 1
-#endif
-
#if (XERCES_VERSION_MAJOR == 3) || ((XERCES_VERSION_MAJOR == 2) && (XERCES_VERSION_MINOR >= 3))
/*
* As of version 2.3, xerces requires a version parameter in XMLFormatter
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.cpp Thu Aug 31 00:02:22 2017
@@ -108,8 +108,6 @@ xsecsize_t XSECBinTXFMInputStream::readB
}
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
const XMLCh* XSECBinTXFMInputStream::getContentType() const {
return NULL;
}
-#endif
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECBinTXFMInputStream.hpp Thu Aug 31 00:02:22 2017
@@ -132,9 +132,7 @@ public :
const xsecsize_t maxToRead);
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
const XMLCh* getContentType() const;
-#endif
private :
Modified: santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp Thu Aug 31 00:02:22 2017
@@ -336,8 +336,6 @@ xsecsize_t XSECBinHTTPURIInputStream::re
return len;
}
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
const XMLCh* XSECBinHTTPURIInputStream::getContentType() const {
return NULL;
}
-#endif
Modified: santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp Thu Aug 31 00:02:22 2017
@@ -76,9 +76,7 @@ public :
, const xsecsize_t maxToRead
);
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
const XMLCh* getContentType() const;
-#endif
private :
// -----------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp Thu Aug 31 00:02:22 2017
@@ -591,8 +591,6 @@ xsecsize_t XSECBinHTTPURIInputStream::re
return len;
}
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
const XMLCh* XSECBinHTTPURIInputStream::getContentType() const {
return NULL;
}
-#endif
Modified: santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp?rev=1806748&r1=1806747&r2=1806748&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp Thu Aug 31 00:02:22 2017
@@ -82,15 +82,13 @@ class DSIG_EXPORT XSECBinHTTPURIInputStr
{
public :
- XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
- ~XSECBinHTTPURIInputStream();
+ XSECBinHTTPURIInputStream(const XERCES_CPP_NAMESPACE_QUALIFIER XMLUri& urlSource);
+ ~XSECBinHTTPURIInputStream();
- XMLFilePos curPos() const;
- xsecsize_t readBytes(XMLByte* const toFill, const xsecsize_t maxToRead);
+ XMLFilePos curPos() const;
+ xsecsize_t readBytes(XMLByte* const toFill, const xsecsize_t maxToRead);
-#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
- const XMLCh* getContentType() const;
-#endif
+ const XMLCh* getContentType() const;
static void Cleanup();