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/30 23:56:43 UTC
svn commit: r1806747 - in /santuario/xml-security-cpp/trunk: configure.ac
xsec/framework/XSECConfig.hpp.in xsec/framework/XSECW32Config.hpp
xsec/samples/IOStreamOutputter.cpp xsec/tools/templatesign/templatesign.cpp
Author: scantor
Date: Wed Aug 30 23:56:43 2017
New Revision: 1806747
URL: http://svn.apache.org/viewvc?rev=1806747&view=rev
Log:
Assume Xerces 3 - remove XSEC_XERCES_DOMENTITYINPUTENCODING
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/samples/IOStreamOutputter.cpp
santuario/xml-security-cpp/trunk/xsec/tools/templatesign/templatesign.cpp
Modified: santuario/xml-security-cpp/trunk/configure.ac
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/configure.ac?rev=1806747&r1=1806746&r2=1806747&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/configure.ac (original)
+++ santuario/xml-security-cpp/trunk/configure.ac Wed Aug 30 23:56:43 2017
@@ -163,14 +163,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#in
AC_DEFINE([XSEC_XERCES_XMLSTRING_HAS_RELEASE],[1],[Define to 1 if Xerces XMLString has release method.])],
[AC_MSG_RESULT([no])])
-AC_MSG_CHECKING([whether Xerces DOMEntity uses getInputEncoding()])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/dom/DOM.hpp>]], [[using namespace XERCES_CPP_NAMESPACE;
- DOMEntity *t;
- t->getInputEncoding();
- ]])],[AC_MSG_RESULT([yes])
- AC_DEFINE([XSEC_XERCES_DOMENTITYINPUTENCODING],[1],[Define to 1 if Xerces DOMEntity has getInputEncoding.])],
- [AC_MSG_RESULT([no])])
-
# Now check for Xalan
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=1806747&r1=1806746&r2=1806747&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECConfig.hpp.in Wed Aug 30 23:56:43 2017
@@ -45,9 +45,6 @@
/* Define to 1 if Xalan XercesParserLiaison ctor takes XercesDOMSupport. */
#undef XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
-/* Define to 1 if Xerces DOMEntity has getInputEncoding. */
-#undef XSEC_XERCES_DOMENTITYINPUTENCODING
-
/* Define to 1 if Xerces XMLFormatter requires version. */
#undef XSEC_XERCES_FORMATTER_REQUIRES_VERSION
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=1806747&r1=1806746&r2=1806747&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECW32Config.hpp Wed Aug 30 23:56:43 2017
@@ -39,12 +39,6 @@
#if (XERCES_VERSION_MAJOR >= 3)
-
-/* 3.0 now uses getInputEncoding rather than getEncoding to determine
- encoding that was found in input document */
-
-# define XSEC_XERCES_DOMENTITYINPUTENCODING 1
-
/* 3.0 InputStream must expose content type */
# define XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE 1
Modified: santuario/xml-security-cpp/trunk/xsec/samples/IOStreamOutputter.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/samples/IOStreamOutputter.cpp?rev=1806747&r1=1806746&r2=1806747&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/samples/IOStreamOutputter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/samples/IOStreamOutputter.cpp Wed Aug 30 23:56:43 2017
@@ -911,13 +911,7 @@ void docSetup(DOMDocument *doc) {
DOMNode *aNode = doc->getFirstChild();
if (aNode->getNodeType() == DOMNode::ENTITY_NODE)
{
- const XMLCh* aStr = ((DOMEntity *)aNode)->
-#if defined XSEC_XERCES_DOMENTITYINPUTENCODING
- getInputEncoding();
-#else
- getEncoding();
-#endif
-
+ const XMLCh* aStr = ((DOMEntity *)aNode)->getInputEncoding();
if (!strEquals(aStr, ""))
{
encNameStr = aStr;
Modified: santuario/xml-security-cpp/trunk/xsec/tools/templatesign/templatesign.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/templatesign/templatesign.cpp?rev=1806747&r1=1806746&r2=1806747&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/templatesign/templatesign.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/templatesign/templatesign.cpp Wed Aug 30 23:56:43 2017
@@ -1353,12 +1353,7 @@ int main(int argc, char **argv) {
DOMNode *aNode = doc->getFirstChild();
if (aNode->getNodeType() == DOMNode::ENTITY_NODE)
{
- const XMLCh* aStr =
-#if defined XSEC_XERCES_DOMENTITYINPUTENCODING
- ((DOMEntity *)aNode)->getInputEncoding();
-#else
- ((DOMEntity *)aNode)->getEncoding();
-#endif
+ const XMLCh* aStr = ((DOMEntity *)aNode)->getInputEncoding();
if (!strEquals(aStr, ""))
{
encNameStr = aStr;