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/09/01 18:57:42 UTC
svn commit: r1807003 - in /santuario/xml-security-cpp/trunk: configure.ac
xsec/canon/XSECC14n20010315.cpp xsec/canon/XSECC14n20010315.hpp
xsec/transformers/TXFMXPath.cpp xsec/transformers/TXFMXPathFilter.cpp
xsec/transformers/TXFMXSL.cpp
Author: scantor
Date: Fri Sep 1 18:57:42 2017
New Revision: 1807003
URL: http://svn.apache.org/viewvc?rev=1807003&view=rev
Log:
Assume Xalan 1.11 - add autoconf test for version
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp
santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Fri Sep 1 18:57:42 2017
@@ -171,6 +171,18 @@ else
fi
if test "${xalan_found}" = "yes" ; then
+
+AC_MSG_CHECKING([Xalan version])
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <xalanc/Include/XalanVersion.hpp>],
+[#if _XALAN_VERSION >= 11100
+int i = 0;
+#else
+#error requires Xalan version 1.11+
+#endif])],
+ [AC_MSG_RESULT(OK)],
+ [AC_MSG_FAILURE([Xalan-C 1.11+ is required])])
+
# Do we need xalanMsg.so?
AC_MSG_CHECKING([if libxalanMsg is required])
old_libs=$LIBS
@@ -179,6 +191,7 @@ if test "${xalan_found}" = "yes" ; then
int test=1;
]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
LIBS=${old_libs}]);
+
fi
Modified: santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp Fri Sep 1 18:57:42 2017
@@ -456,13 +456,8 @@ int XSECC14n20010315::XPathSelectNodes(c
// We use Xalan to process the Xerces DOM tree and get the XPath nodes
-#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
XercesParserLiaison theParserLiaison;
XercesDOMSupport theDOMSupport(theParserLiaison);
-#else
- XercesDOMSupport theDOMSupport;
- XercesParserLiaison theParserLiaison;
-#endif // XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
if (mp_doc == 0) {
throw XSECException(XSECException::UnsupportedFunction,
Modified: santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.hpp?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.hpp Fri Sep 1 18:57:42 2017
@@ -151,7 +151,6 @@ private:
bool m_returnedFromChild; // Did we get to this node from below?
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode * mp_firstElementNode; // The root element of the document
bool m_firstElementProcessed; // Has the first node been handled?
- unsigned char * mp_charBuffer;
// For XPath evaluation
bool m_XPathSelection; // Are we doing an XPath?
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp Fri Sep 1 18:57:42 2017
@@ -287,11 +287,7 @@ void TXFMXPath::evaluateExpr(DOMNode *h,
XPathProcessorImpl xppi; // The processor
XercesParserLiaison xpl;
-#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
XercesDOMSupport xds(xpl);
-#else
- XercesDOMSupport xds;
-#endif
XPathEvaluator xpe;
XPathFactoryDefault xpf;
XPathConstructionContextDefault xpcc;
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp Fri Sep 1 18:57:42 2017
@@ -187,11 +187,7 @@ XSECXPathNodeList * TXFMXPathFilter::eva
XPathProcessorImpl xppi; // The processor
XercesParserLiaison xpl;
-#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
XercesDOMSupport xds(xpl);
-#else
- XercesDOMSupport xds;
-#endif
XPathEvaluator xpe;
XPathFactoryDefault xpf;
XPathConstructionContextDefault xpcc;
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp?rev=1807003&r1=1807002&r2=1807003&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp Fri Sep 1 18:57:42 2017
@@ -104,12 +104,7 @@ void TXFMXSL::expandNameSpaces(void) {
TXFMXSL::TXFMXSL(DOMDocument *doc) :
- TXFMBase(doc),
-#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
-xds(xpl)
-#else
-xpl()
-#endif
+ TXFMBase(doc), xds(xpl)
{
// Zeroise all the pointers