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 18:56:01 UTC
svn commit: r1806838 - in /santuario/xml-security-cpp/trunk: configure.ac
xsec/framework/XSECConfig.hpp.in xsec/framework/XSECW32Config.hpp
xsec/transformers/TXFMXPath.cpp xsec/transformers/TXFMXPathFilter.cpp
Author: scantor
Date: Thu Aug 31 18:56:01 2017
New Revision: 1806838
URL: http://svn.apache.org/viewvc?rev=1806838&view=rev
Log:
Assume Xalan 1.11 - remove XSEC_XSLEXCEPTION_RETURNS_DOMSTRING
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/transformers/TXFMXPath.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806838&r1=1806837&r2=1806838&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Thu Aug 31 18:56:01 2017
@@ -184,17 +184,6 @@ fi
# Check for handling of XSLException types
if test "$xalan_found" = "yes" ; then
- AC_MSG_CHECKING([whether XSLException::getType() returns XalanDOMString])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/PlatformSupport/XSLException.hpp>]], [[ try {
- int x = 1;
- }
- catch (XALAN_CPP_NAMESPACE_QUALIFIER XSLException &e) {
- e.getType().c_str();
- }
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XSLEXCEPTION_RETURNS_DOMSTRING],[1],[Define to 1 if Xalan XSLException returns XalanDOMString.])],
- [AC_MSG_RESULT([no])]);
-
AC_MSG_CHECKING([whether XercesParserLiaison ctor takes XercesDOMSupport])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
#include <xalanc/XercesParserLiaison/XercesParserLiaison.hpp>]], [[ XALAN_CPP_NAMESPACE_QUALIFIER XercesDOMSupport
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=1806838&r1=1806837&r2=1806838&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 18:56:01 2017
@@ -45,7 +45,4 @@
/* Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport. */
#undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-/* Define to 1 if Xalan XSLException returns XalanDOMString. */
-#undef XSEC_XSLEXCEPTION_RETURNS_DOMSTRING
-
#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=1806838&r1=1806837&r2=1806838&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Thu Aug 31 18:56:01 2017
@@ -44,17 +44,8 @@
# include <xalanc/Include/XalanVersion.hpp>
-# if (_XALAN_VERSION <= 10800)
-# define XSEC_XSLEXCEPTION_RETURNS_DOMSTRING 1
-# endif
# if (_XALAN_VERSION >= 10900)
- /* 1.9 and above have XSLException::getType() returns XalanDOMChar *, not
- XalanDOMString
- */
-
-# undef XSEC_XSLEXCEPTION_RETURNS_DOMSTRING
-
/* 1.9 and above do not take a XercesDOMSupport as input to the ctor */
# undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
@@ -70,11 +61,6 @@
# define XSEC_XALAN_REQS_MEMORYMANAGER
# else
- /* 1.9 and above have XSLException::getType() returns XalanDOMChar *, not
- XalanDOMString
- */
-
-# define XSEC_XSLEXCEPTION_RETURNS_DOMSTRING 1
/* 1.9 and above do not take a XercesDOMSupport as input to the ctor */
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=1806838&r1=1806837&r2=1806838&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp Thu Aug 31 18:56:01 2017
@@ -495,11 +495,7 @@ void TXFMXPath::evaluateExpr(DOMNode *h,
// Collate the exception message into an XSEC message.
msg.sbTranscodeIn("Xalan Exception : ");
-#if defined (XSEC_XSLEXCEPTION_RETURNS_DOMSTRING)
- msg.sbXMLChCat(e.getType().c_str());
-#else
msg.sbXMLChCat(e.getType());
-#endif
msg.sbXMLChCat(" caught. Message : ");
msg.sbXMLChCat(e.getMessage().c_str());
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=1806838&r1=1806837&r2=1806838&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp Thu Aug 31 18:56:01 2017
@@ -333,11 +333,7 @@ XSECXPathNodeList * TXFMXPathFilter::eva
// Collate the exception message into an XSEC message.
msg.sbTranscodeIn("Xalan Exception : ");
-#if defined (XSEC_XSLEXCEPTION_RETURNS_DOMSTRING)
- msg.sbXMLChCat(e.getType().c_str());
-#else
msg.sbXMLChCat(e.getType());
-#endif
msg.sbXMLChCat(" caught. Message : ");
msg.sbXMLChCat(e.getMessage().c_str());