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:08:26 UTC
svn commit: r1806998 - in /santuario/xml-security-cpp/trunk: configure.ac
xsec/canon/XSECC14n20010315.cpp xsec/framework/XSECConfig.hpp.in
xsec/framework/XSECW32Config.hpp
Author: scantor
Date: Fri Sep 1 18:08:25 2017
New Revision: 1806998
URL: http://svn.apache.org/viewvc?rev=1806998&view=rev
Log:
Assume Xalan 1.11 - remove XSEC_SELECTNODELIST_REQS_NODEREFLIST
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in
santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806998&r1=1806997&r2=1806998&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Fri Sep 1 18:08:25 2017
@@ -181,26 +181,6 @@ if test "${xalan_found}" = "yes" ; then
LIBS=${old_libs}]);
fi
-# Check for handling of XSLException types
-if test "$xalan_found" = "yes" ; then
-
- AC_MSG_CHECKING([whether XPathEvaluator::selectNodeList requires NodeRefList])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
- #include <xalanc/XPath/XPathEvaluator.hpp>
- #include <xalanc/XPath/NodeRefList.hpp>
- #include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>]], [[ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
- theDOMSupport;
- XALAN_CPP_NAMESPACE_QUALIFIER XPathEvaluator theEvaluator;
- XALAN_CPP_NAMESPACE_QUALIFIER NodeRefList theResult(
- theEvaluator.selectNodeList(
- theDOMSupport,
- NULL,
- NULL,
- NULL));
- ]])],[AC_MSG_RESULT([no])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_SELECTNODELIST_REQS_NODEREFLIST],[1],[Define to 1 if Xalan XPathEvaluator requires NodeRefList.])]);
-fi
# Crypto provider options (OpenSSL / NSS)
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=1806998&r1=1806997&r2=1806998&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:08:25 2017
@@ -503,11 +503,9 @@ int XSECC14n20010315::XPathSelectNodes(c
XalanDOMString ed = XalanDOMString(XPathExpr);
const XalanDOMChar * expr = ed.c_str();
-#if defined XSEC_SELECTNODELIST_REQS_NODEREFLIST
-
NodeRefList output;
- NodeRefList theResult(
+ NodeRefList theResult(
theEvaluator.selectNodeList(
output,
theDOMSupport,
@@ -515,18 +513,7 @@ int XSECC14n20010315::XPathSelectNodes(c
expr,
theDoc->getElementById(XalanDOMString("ns"))));
-#else
-
- NodeRefList theResult(
- theEvaluator.selectNodeList(
- theDOMSupport,
- theContextNode,
- expr,
- theDoc->getElementById(XalanDOMString("ns"))));
- //theDoc->getDocumentElement()));
-#endif
- //XercesDocumentBridge *theBridge = theParserLiaison.mapDocument(theDoc);
XercesDocumentWrapper *theWrapper = theParserLiaison.mapDocumentToWrapper(theDoc);
XercesWrapperNavigator theWrapperNavigator(theWrapper);
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=1806998&r1=1806997&r2=1806998&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in Fri Sep 1 18:08:25 2017
@@ -36,7 +36,4 @@
/* Define to 1 if OpenSSL has SHA2 support. */
#undef XSEC_OPENSSL_HAVE_SHA2
-/* Define to 1 if Xalan XPathEvaluator requires NodeRefList. */
-#undef XSEC_SELECTNODELIST_REQS_NODEREFLIST
-
#include <xsec/framework/XSECVersion.hpp>
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=1806998&r1=1806997&r2=1806998&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Fri Sep 1 18:08:25 2017
@@ -40,29 +40,6 @@
#define XSEC_NO_XALAN
-#if !defined (XSEC_NO_XALAN)
-
-# include <xalanc/Include/XalanVersion.hpp>
-
-# if (_XALAN_VERSION >= 10900)
-
- /* 1.9 and above require a NodeRefList as input to XPathEvaluator::
- selectNodeList
- */
-
-# define XSEC_SELECTNODELIST_REQS_NODEREFLIST
-
-# else
-
- /* 1.9 and above require a NodeRefList as input to XPathEvaluator::
- selectNodeList
- */
-
-# undef XSEC_SELECTNODELIST_REQS_NODEREFLIST
-
-# endif
-
-#endif
/*
* Define presence of cryptographic providers