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 17:58:59 UTC
svn commit: r1806997 - in /santuario/xml-security-cpp/trunk: ./ xsec/canon/
xsec/dsig/ xsec/framework/ xsec/transformers/
Author: scantor
Date: Fri Sep 1 17:58:59 2017
New Revision: 1806997
URL: http://svn.apache.org/viewvc?rev=1806997&view=rev
Log:
Assume Xalan 1.11 - remove XSEC_XALAN_REQS_MEMORYMANAGER
Modified:
santuario/xml-security-cpp/trunk/configure.ac
santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.hpp
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/TXFMXSL.cpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Fri Sep 1 17:58:59 2017
@@ -184,16 +184,6 @@ fi
# Check for handling of XSLException types
if test "$xalan_found" = "yes" ; then
- 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
- theDOMSupport;
- XALAN_CPP_NAMESPACE_QUALIFIER XercesParserLiaison
- theParserLiaison(theDOMSupport);
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT],[1],[Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport.])],
- [AC_MSG_RESULT([no])]);
-
AC_MSG_CHECKING([whether XPathEvaluator::selectNodeList requires NodeRefList])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xalanc/XercesParserLiaison/XercesDOMSupport.hpp>
#include <xalanc/XPath/XPathEvaluator.hpp>
@@ -210,85 +200,6 @@ if test "$xalan_found" = "yes" ; then
]])],[AC_MSG_RESULT([no])],
[AC_MSG_RESULT([yes])
AC_DEFINE([XSEC_SELECTNODELIST_REQS_NODEREFLIST],[1],[Define to 1 if Xalan XPathEvaluator requires NodeRefList.])]);
-
- AC_MSG_CHECKING([whether Xalan classes require MemoryManager])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <xalanc/XPath/XPathDefinitions.hpp>
- #include <xalanc/XPath/Function.hpp>]], [[
- }
- XALAN_CPP_NAMESPACE_BEGIN
-
- class FunctionTest : public Function
- {
- public:
- typedef Function ParentType;
-
- FunctionTest();
-
- virtual ~FunctionTest();
- virtual XObjectPtr
- execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectArgVectorType& args,
- const LocatorType* locator) const;
-
- XObjectPtr
- execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2,
- const LocatorType* locator) const;
-
- XObjectPtr
- execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
-
- const XObjectPtr arg1,
- const XObjectPtr arg2,
- const XObjectPtr arg3,
- const LocatorType* locator) const;
-
- #if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
- #endif
-
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual Function*
- #else
- virtual FunctionTest*
- #endif
- clone() const;
-
- protected:
-
- virtual const XalanDOMString
- getError() const;
-
- private:
-
- // Not implemented...
- FunctionTest&
- operator=(const FunctionTest&);
-
- bool
- operator==(const FunctionTest&) const;
- };
-
- void main2(void){
-
- FunctionTest t;
-
- }
-
-XALAN_CPP_NAMESPACE_END
- int main3(void) {
-
- ]])],[AC_MSG_RESULT([no])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XALAN_REQS_MEMORYMANAGER],[1],[Define to 1 if Xalan requires MemoryManager])]);
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=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp Fri Sep 1 17:58:59 2017
@@ -461,11 +461,7 @@ int XSECC14n20010315::XPathSelectNodes(c
XercesDOMSupport theDOMSupport(theParserLiaison);
#else
XercesDOMSupport theDOMSupport;
-#if defined XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
- XercesParserLiaison theParserLiaison(theDOMSupport);
-#else
XercesParserLiaison theParserLiaison;
-#endif
#endif // XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
if (mp_doc == 0) {
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.cpp?rev=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.cpp Fri Sep 1 17:58:59 2017
@@ -30,10 +30,7 @@
#ifndef XSEC_NO_XPATH
-#if defined XSEC_XALAN_REQS_MEMORYMANAGER
-// Xalan 1.9 and above
- XALAN_USING_XALAN(XalanCopyConstruct);
-#endif
+XALAN_USING_XALAN(XalanCopyConstruct);
DSIGXPathHere::DSIGXPathHere() {
@@ -71,48 +68,20 @@ XObjectPtr DSIGXPathHere::execute(
}
-
-
#if defined(XSEC_NO_COVARIANT_RETURN_TYPE)
Function*
#else
DSIGXPathHere*
#endif
-#if defined (XSEC_XALAN_REQS_MEMORYMANAGER)
- DSIGXPathHere::clone(MemoryManagerType& theManager)
-#else
- DSIGXPathHere::clone()
-#endif
- const {
-
-#if defined (XSEC_XALAN_REQS_MEMORYMANAGER)
+ DSIGXPathHere::clone(MemoryManagerType& theManager) const {
return XalanCopyConstruct(theManager, *this);
-#else
- DSIGXPathHere *ret;
-
- ret = new DSIGXPathHere(*this);
- ret->XalanHereNode = XalanHereNode;
- return ret;
-#endif
}
const XalanDOMString
-#if defined XSEC_XALAN_REQS_MEMORYMANAGER
- // We cheat - the memory manager happened at the same time as the string
- &DSIGXPathHere::getError(XalanDOMString& theBuffer)
-#else
- DSIGXPathHere::getError()
-#endif
- const {
+ &DSIGXPathHere::getError(XalanDOMString& theBuffer) const {
-#if defined XSEC_XALAN_REQS_MEMORYMANAGER
- theBuffer = "The here() function takes no arguments!";
+ theBuffer = "The here() function takes no arguments!";
return theBuffer;
-#else
- return StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("The here() function takes no arguments!"));
-#endif
-
}
-
#endif /* NO_XPATH */
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.hpp?rev=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathHere.hpp Fri Sep 1 17:58:59 2017
@@ -61,12 +61,7 @@ XALAN_USING_XALAN(XalanNode);
XALAN_USING_XALAN(XPathExecutionContext);
XALAN_USING_XALAN(XalanDOMString);
XALAN_USING_XALAN(XObjectPtr);
-//XALAN_USING_XALAN(StaticStringToDOMString);
-
-#if defined XSEC_XALAN_REQS_MEMORYMANAGER
-// Xalan 1.9 and above
- XALAN_USING_XALAN(MemoryManagerType);
-#endif
+XALAN_USING_XALAN(MemoryManagerType);
XSEC_USING_XERCES(Locator);
@@ -110,21 +105,11 @@ public:
#else
virtual DSIGXPathHere*
#endif
-#if defined (XSEC_XALAN_REQS_MEMORYMANAGER)
clone(MemoryManagerType& theManager) const;
-#else
- clone() const;
-#endif
protected:
- const XalanDOMString
-#if defined (XSEC_XALAN_REQS_MEMORYMANAGER)
- // We cheat - the memory manager happened at the same time as the string
- &getError(XalanDOMString& theBuffer) const;
-#else
- getError() const;
-#endif
+ const XalanDOMString& getError(XalanDOMString& theBuffer) const;
private:
@@ -140,10 +125,3 @@ private:
#endif
-
-
-
-
-
-
-
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=1806997&r1=1806996&r2=1806997&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 17:58:59 2017
@@ -39,10 +39,4 @@
/* Define to 1 if Xalan XPathEvaluator requires NodeRefList. */
#undef XSEC_SELECTNODELIST_REQS_NODEREFLIST
-/* Define to 1 if Xalan requires MemoryManager */
-#undef XSEC_XALAN_REQS_MEMORYMANAGER
-
-/* Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport. */
-#undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-
#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=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Fri Sep 1 17:58:59 2017
@@ -46,37 +46,20 @@
# if (_XALAN_VERSION >= 10900)
- /* 1.9 and above do not take a XercesDOMSupport as input to the ctor */
-
-# undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-
/* 1.9 and above require a NodeRefList as input to XPathEvaluator::
selectNodeList
*/
# define XSEC_SELECTNODELIST_REQS_NODEREFLIST
- /* 1.9 and above use MemoryManager for the XPath Function classes
- */
-
-# define XSEC_XALAN_REQS_MEMORYMANAGER
# else
- /* 1.9 and above do not take a XercesDOMSupport as input to the ctor */
-
-# define XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-
/* 1.9 and above require a NodeRefList as input to XPathEvaluator::
selectNodeList
*/
# undef XSEC_SELECTNODELIST_REQS_NODEREFLIST
- /* 1.9 and above use MemoryManager for the XPath Function classes
- */
-
-# undef XSEC_XALAN_REQS_MEMORYMANAGER
-
# endif
#endif
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=1806997&r1=1806996&r2=1806997&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp Fri Sep 1 17:58:59 2017
@@ -108,12 +108,8 @@ TXFMXSL::TXFMXSL(DOMDocument *doc) :
#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
xds(xpl)
#else
-#if defined XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-xpl(xds)
-#else
xpl()
#endif
-#endif
{
// Zeroise all the pointers