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 2018/06/11 16:25:42 UTC
svn commit: r1833341 - in /santuario/xml-security-cpp/trunk/xsec: canon/
dsig/ enc/ enc/NSS/ enc/WinCAPI/ framework/ tools/checksig/ tools/cipher/
tools/xtest/ transformers/ utils/ utils/winutils/ xenc/impl/
Author: scantor
Date: Mon Jun 11 16:25:41 2018
New Revision: 1833341
URL: http://svn.apache.org/viewvc?rev=1833341&view=rev
Log:
Header cleanup.
Modified:
santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp
santuario/xml-security-cpp/trunk/xsec/canon/XSECCanon.cpp
santuario/xml-security-cpp/trunk/xsec/canon/XSECXMLNSStack.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoDEREncoded.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoList.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoMgmtData.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoName.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoPGPData.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoValue.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoX509.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReference.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReferenceList.hpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignature.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignedInfo.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathFilterExpr.cpp
santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp
santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp
santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoUtils.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmMapper.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECException.cpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECProvider.cpp
santuario/xml-security-cpp/trunk/xsec/tools/checksig/AnonymousResolver.cpp
santuario/xml-security-cpp/trunk/xsec/tools/checksig/InteropResolver.cpp
santuario/xml-security-cpp/trunk/xsec/tools/cipher/XencInteropResolver.cpp
santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMHash.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp
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
santuario/xml-security-cpp/trunk/xsec/utils/XSECDOMUtils.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECNameSpaceExpander.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECSOAPRequestorSimple.cpp
santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp
santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherDataImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherReferenceImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherValueImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedDataImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedKeyImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedTypeImpl.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptionMethodImpl.cpp
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=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECC14n20010315.cpp Mon Jun 11 16:25:41 2018
@@ -33,9 +33,10 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/canon/XSECC14n20010315.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/utils/XSECSafeBufferFormatter.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
// Xerces includes
#include <xercesc/dom/DOMElement.hpp>
#include <xercesc/dom/DOMNamedNodeMap.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/canon/XSECCanon.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/canon/XSECCanon.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECCanon.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECCanon.cpp Mon Jun 11 16:25:41 2018
@@ -31,7 +31,8 @@
*/
#include <xsec/canon/XSECCanon.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <memory.h>
Modified: santuario/xml-security-cpp/trunk/xsec/canon/XSECXMLNSStack.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/canon/XSECXMLNSStack.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/canon/XSECXMLNSStack.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/canon/XSECXMLNSStack.cpp Mon Jun 11 16:25:41 2018
@@ -30,9 +30,10 @@
// XSEC
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/canon/XSECXMLNSStack.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
// Xerces
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp Mon Jun 11 16:25:41 2018
@@ -29,17 +29,17 @@
// XSEC Includes
-#include <xsec/framework/XSECDefs.hpp>
#include <xsec/dsig/DSIGAlgorithmHandlerDefault.hpp>
#include <xsec/enc/XSECCryptoKey.hpp>
+#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/transformers/TXFMBase64.hpp>
#include <xsec/transformers/TXFMHash.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include "../utils/XSECAlgorithmSupport.hpp"
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/dom/DOM.hpp>
#include <xercesc/util/Janitor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGConstants.cpp Mon Jun 11 16:25:41 2018
@@ -29,7 +29,8 @@
*/
#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoDEREncoded.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoDEREncoded.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoDEREncoded.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoDEREncoded.cpp Mon Jun 11 16:25:41 2018
@@ -30,10 +30,11 @@
#include <xsec/dsig/DSIGKeyInfoDEREncoded.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
#include <xercesc/util/Janitor.hpp>
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoList.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoList.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoList.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoList.cpp Mon Jun 11 16:25:41 2018
@@ -39,7 +39,6 @@
#include <xsec/dsig/DSIGKeyInfoMgmtData.hpp>
#include <xsec/dsig/DSIGKeyInfoExt.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/dsig/DSIGReference.hpp>
#include <xsec/dsig/DSIGTransformList.hpp>
@@ -47,6 +46,7 @@
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/transformers/TXFMBase.hpp>
+#include "../utils/XSECDOMUtils.hpp"
#include "../xenc/impl/XENCEncryptedKeyImpl.hpp"
#include <xercesc/util/Janitor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoMgmtData.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoMgmtData.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoMgmtData.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoMgmtData.cpp Mon Jun 11 16:25:41 2018
@@ -30,10 +30,11 @@
#include <xsec/dsig/DSIGKeyInfoMgmtData.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
#include <xercesc/util/Janitor.hpp>
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoName.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoName.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoName.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoName.cpp Mon Jun 11 16:25:41 2018
@@ -29,11 +29,12 @@
*/
#include <xsec/dsig/DSIGKeyInfoName.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoPGPData.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoPGPData.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoPGPData.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoPGPData.cpp Mon Jun 11 16:25:41 2018
@@ -31,11 +31,10 @@
#include <xsec/dsig/DSIGKeyInfoPGPData.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/framework/XSECEnv.hpp>
-#include <xercesc/util/Janitor.hpp>
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoValue.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoValue.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoValue.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoValue.cpp Mon Jun 11 16:25:41 2018
@@ -27,11 +27,12 @@
*/
#include <xsec/dsig/DSIGKeyInfoValue.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECException.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoX509.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoX509.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoX509.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGKeyInfoX509.cpp Mon Jun 11 16:25:41 2018
@@ -28,13 +28,13 @@
*/
#include <xsec/dsig/DSIGKeyInfoX509.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
#include "../utils/XSECAutoPtr.hpp"
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.cpp Mon Jun 11 16:25:41 2018
@@ -29,12 +29,13 @@
// XSEC Includes
+#include <xsec/dsig/DSIGConstants.hpp>
+#include <xsec/dsig/DSIGObject.hpp>
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECEnv.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/dsig/DSIGObject.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/dom/DOM.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.hpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGObject.hpp Mon Jun 11 16:25:41 2018
@@ -34,6 +34,7 @@
#include <xsec/framework/XSECDefs.hpp>
+XSEC_DECLARE_XERCES_CLASS(DOMElement);
XSEC_DECLARE_XERCES_CLASS(DOMNode);
class XSECEnv;
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReference.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReference.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReference.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReference.cpp Mon Jun 11 16:25:41 2018
@@ -55,9 +55,10 @@
#include <xsec/framework/XSECAlgorithmHandler.hpp>
#include <xsec/framework/XSECAlgorithmMapper.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/utils/XSECBinTXFMInputStream.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
// Xerces
#include <xercesc/util/XMLNetAccessor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReferenceList.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReferenceList.hpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReferenceList.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGReferenceList.hpp Mon Jun 11 16:25:41 2018
@@ -32,7 +32,6 @@
// XSEC Includes
#include <xsec/framework/XSECDefs.hpp>
-//#include <dsig/DSIGReference.hpp>
// General includes
#include <vector>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignature.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignature.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignature.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignature.cpp Mon Jun 11 16:25:41 2018
@@ -56,10 +56,10 @@
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/utils/XSECBinTXFMInputStream.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
#include "../utils/XSECAlgorithmSupport.hpp"
+#include "../utils/XSECDOMUtils.hpp"
// Xerces includes
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignedInfo.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignedInfo.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignedInfo.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGSignedInfo.cpp Mon Jun 11 16:25:41 2018
@@ -27,12 +27,13 @@
*/
// XSEC Includes
-#include <xsec/dsig/DSIGSignedInfo.hpp>
#include <xsec/dsig/DSIGReference.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include <xsec/dsig/DSIGSignedInfo.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/util/Janitor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformBase64.cpp Mon Jun 11 16:25:41 2018
@@ -30,14 +30,15 @@
#include <xsec/dsig/DSIGTransformBase64.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMBase64.hpp>
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/transformers/TXFMXPath.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformC14n.cpp Mon Jun 11 16:25:41 2018
@@ -26,15 +26,13 @@
*
*/
+#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/dsig/DSIGTransformC14n.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-
-#include <xercesc/util/Janitor.hpp>
#include "../utils/XSECAlgorithmSupport.hpp"
#include "../utils/XSECDOMUtils.hpp"
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformEnvelope.cpp Mon Jun 11 16:25:41 2018
@@ -30,14 +30,15 @@
#include <xsec/dsig/DSIGTransformEnvelope.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/framework/XSECException.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMEnvelope.hpp>
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/transformers/TXFMXPath.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPath.cpp Mon Jun 11 16:25:41 2018
@@ -26,20 +26,18 @@
*
*/
-
+#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/dsig/DSIGTransformXPath.hpp>
#include <xsec/transformers/TXFMXPath.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-
-#include <xercesc/util/Janitor.hpp>
#include "../utils/XSECDOMUtils.hpp"
+
XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXPathFilter.cpp Mon Jun 11 16:25:41 2018
@@ -29,18 +29,18 @@
*
*/
+#include <xsec/dsig/DSIGSignature.hpp>
#include <xsec/dsig/DSIGTransformXPathFilter.hpp>
#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-#include <xsec/framework/XSECError.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMXPathFilter.hpp>
#include <xsec/transformers/TXFMChain.hpp>
-#include <xercesc/dom/DOMNode.hpp>
-
#include "../utils/XSECDOMUtils.hpp"
+#include <xercesc/dom/DOMNode.hpp>
+
XERCES_CPP_NAMESPACE_USE
// --------------------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGTransformXSL.cpp Mon Jun 11 16:25:41 2018
@@ -28,15 +28,16 @@
// XSEC
-#include <xsec/dsig/DSIGTransformXSL.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/dsig/DSIGTransformXSL.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/framework/XSECException.hpp>
#include <xsec/transformers/TXFMXSL.hpp>
#include <xsec/transformers/TXFMC14n.hpp>
#include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/framework/XSECException.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/dom/DOM.hpp>
#include <xercesc/framework/MemBufFormatTarget.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathFilterExpr.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathFilterExpr.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathFilterExpr.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGXPathFilterExpr.cpp Mon Jun 11 16:25:41 2018
@@ -28,18 +28,18 @@
*
*/
-#include <xsec/framework/XSECDefs.hpp>
-#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
+#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECException.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include "../utils/XSECDOMUtils.hpp"
+
#include <xercesc/dom/DOMNode.hpp>
#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-#include "../utils/XSECDOMUtils.hpp"
-
XERCES_CPP_NAMESPACE_USE
XMLCh filterStr[] = {
Modified: santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp Mon Jun 11 16:25:41 2018
@@ -29,10 +29,11 @@
#include <xsec/enc/NSS/NSSCryptoHashHMAC.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/NSS/NSSCryptoKeyHMAC.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#if defined (XSEC_HAVE_NSS)
+#include "../../utils/XSECDOMUtils.hpp"
+
#include <memory.h>
// --------------------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp Mon Jun 11 16:25:41 2018
@@ -28,14 +28,15 @@
*
*/
-#include <xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#if defined (XSEC_HAVE_WINCAPI)
+#include "../../utils/XSECDOMUtils.hpp"
+
#include <memory.h>
// --------------------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp Mon Jun 11 16:25:41 2018
@@ -27,20 +27,22 @@
*
*/
-#include <xsec/framework/XSECDefs.hpp>
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp>
+#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xercesc/util/Janitor.hpp>
XERCES_CPP_NAMESPACE_USE
#if defined (XSEC_HAVE_WINCAPI)
+#include "../../utils/XSECDOMUtils.hpp"
+
+#include <xercesc/util/Janitor.hpp>
+
// --------------------------------------------------------------------------------
// Constructors and Destructors
// --------------------------------------------------------------------------------
Modified: santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoUtils.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoUtils.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoUtils.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoUtils.cpp Mon Jun 11 16:25:41 2018
@@ -33,15 +33,15 @@
#include <xsec/enc/XSECCryptoUtils.hpp>
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECAlgorithmSupport.hpp"
+#include "../utils/XSECAutoPtr.hpp"
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
-#include "../utils/XSECAlgorithmSupport.hpp"
-#include "../utils/XSECAutoPtr.hpp"
-
XERCES_CPP_NAMESPACE_USE
#ifdef XSEC_XKMS_ENABLED
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmMapper.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmMapper.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmMapper.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmMapper.cpp Mon Jun 11 16:25:41 2018
@@ -33,7 +33,8 @@
#include <xsec/framework/XSECAlgorithmHandler.hpp>
#include <xsec/framework/XSECAlgorithmMapper.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
// Xerces
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECEnv.cpp Mon Jun 11 16:25:41 2018
@@ -28,11 +28,12 @@
*/
// XSEC Includes
+#include <xsec/dsig/DSIGConstants.hpp>
#include <xsec/framework/XSECEnv.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/framework/XSECURIResolver.hpp>
-#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECException.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECException.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECException.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECException.cpp Mon Jun 11 16:25:41 2018
@@ -31,7 +31,8 @@
*/
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XSECException::XSECException(XSECExceptionType eNum, const XMLCh * inMsg) {
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECProvider.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECProvider.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECProvider.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECProvider.cpp Mon Jun 11 16:25:41 2018
@@ -29,9 +29,9 @@
#include <xsec/framework/XSECProvider.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECURIResolverXerces.hpp>
+#include "../utils/XSECDOMUtils.hpp"
#include "../xenc/impl/XENCCipherImpl.hpp"
#ifdef XSEC_XKMS_ENABLED
Modified: santuario/xml-security-cpp/trunk/xsec/tools/checksig/AnonymousResolver.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/checksig/AnonymousResolver.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/checksig/AnonymousResolver.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/checksig/AnonymousResolver.cpp Mon Jun 11 16:25:41 2018
@@ -33,7 +33,8 @@
// XSEC
#include <xsec/framework/XSECException.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/Janitor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/tools/checksig/InteropResolver.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/checksig/InteropResolver.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/checksig/InteropResolver.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/checksig/InteropResolver.cpp Mon Jun 11 16:25:41 2018
@@ -36,11 +36,12 @@
#include <xsec/dsig/DSIGKeyInfoX509.hpp>
#include <xsec/dsig/DSIGKeyInfoName.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
#include <xsec/enc/OpenSSL/OpenSSLSupport.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
+
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/tools/cipher/XencInteropResolver.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/cipher/XencInteropResolver.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/cipher/XencInteropResolver.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/cipher/XencInteropResolver.cpp Mon Jun 11 16:25:41 2018
@@ -36,9 +36,11 @@
#include <xsec/enc/XSECKeyInfoResolver.hpp>
#include <xsec/dsig/DSIGKeyInfoName.hpp>
#include <xsec/dsig/DSIGKeyInfoX509.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/xenc/XENCCipher.hpp>
#include <xsec/xenc/XENCEncryptedKey.hpp>
+
+#include "../../utils/XSECDOMUtils.hpp"
+
#include <xercesc/util/Janitor.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/tools/xtest/xtest.cpp Mon Jun 11 16:25:41 2018
@@ -70,27 +70,27 @@ XALAN_USING_XALAN(XalanTransformer)
// XSEC
-#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/framework/XSECProvider.hpp>
#include <xsec/canon/XSECC14n20010315.hpp>
#include <xsec/dsig/DSIGReference.hpp>
-#include <xsec/framework/XSECError.hpp>
#include <xsec/dsig/DSIGSignature.hpp>
-#include <xsec/utils/XSECNameSpaceExpander.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/utils/XSECBinTXFMInputStream.hpp>
-#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/dsig/DSIGKeyInfoX509.hpp>
#include <xsec/dsig/DSIGKeyInfoName.hpp>
#include <xsec/dsig/DSIGKeyInfoPGPData.hpp>
#include <xsec/dsig/DSIGKeyInfoSPKIData.hpp>
#include <xsec/dsig/DSIGKeyInfoMgmtData.hpp>
+#include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/enc/XSECCryptoSymmetricKey.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/framework/XSECProvider.hpp>
#include <xsec/xenc/XENCCipher.hpp>
#include <xsec/xenc/XENCEncryptedData.hpp>
#include <xsec/xenc/XENCEncryptedKey.hpp>
#include <xsec/xenc/XENCEncryptionMethod.hpp>
+#include <xsec/utils/XSECNameSpaceExpander.hpp>
+#include <xsec/utils/XSECBinTXFMInputStream.hpp>
+#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/enc/XSECCryptoSymmetricKey.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
#if defined (XSEC_HAVE_OPENSSL)
# include <xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMBase.hpp Mon Jun 11 16:25:41 2018
@@ -31,13 +31,11 @@
#ifndef TXFMBASE_INCLUDE
#define TXFMBASE_INCLUDE
-#include <xercesc/dom/DOM.hpp>
#include <xsec/canon/XSECC14n20010315.hpp>
#include <xsec/utils/XSECNameSpaceExpander.hpp>
#include <xsec/utils/XSECXPathNodeList.hpp>
-// Xalan
-
+#include <xercesc/dom/DOM.hpp>
#include <xercesc/util/BinInputStream.hpp>
#include <stdlib.h>
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMDocObject.cpp Mon Jun 11 16:25:41 2018
@@ -26,9 +26,10 @@
*
*/
-#include <xsec/transformers/TXFMDocObject.hpp>
#include <xsec/framework/XSECException.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include <xsec/transformers/TXFMDocObject.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMEnvelope.cpp Mon Jun 11 16:25:41 2018
@@ -26,9 +26,10 @@
*
*/
-#include <xsec/transformers/TXFMEnvelope.hpp>
#include <xsec/framework/XSECException.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include <xsec/transformers/TXFMEnvelope.hpp>
+
+#include "../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMHash.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMHash.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMHash.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMHash.cpp Mon Jun 11 16:25:41 2018
@@ -26,9 +26,9 @@
*
*/
+#include <xsec/framework/XSECException.hpp>
#include <xsec/transformers/TXFMHash.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/framework/XSECException.hpp>
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMOutputFile.cpp Mon Jun 11 16:25:41 2018
@@ -27,8 +27,8 @@
*
*/
-#include <xsec/transformers/TXFMOutputFile.hpp>
#include <xsec/framework/XSECException.hpp>
+#include <xsec/transformers/TXFMOutputFile.hpp>
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMParser.cpp Mon Jun 11 16:25:41 2018
@@ -28,10 +28,10 @@
*
*/
+#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMParser.hpp>
#include <xsec/transformers/TXFMChain.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECTXFMInputSource.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMURL.cpp Mon Jun 11 16:25:41 2018
@@ -26,8 +26,8 @@
*
*/
-#include <xsec/transformers/TXFMURL.hpp>
#include <xsec/framework/XSECError.hpp>
+#include <xsec/transformers/TXFMURL.hpp>
// To catch exceptions
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=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPath.cpp Mon Jun 11 16:25:41 2018
@@ -27,14 +27,15 @@
*/
-#include <xsec/transformers/TXFMXPath.hpp>
-#include <xsec/transformers/TXFMParser.hpp>
#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
+#include <xsec/transformers/TXFMXPath.hpp>
+#include <xsec/transformers/TXFMParser.hpp>
#ifdef XSEC_HAVE_XALAN
+#include "../utils/XSECDOMUtils.hpp"
+
#if defined(_MSC_VER)
# pragma warning(disable: 4267)
#endif
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=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXPathFilter.cpp Mon Jun 11 16:25:41 2018
@@ -27,20 +27,21 @@
*/
-#include <xsec/transformers/TXFMXPathFilter.hpp>
-#include <xsec/transformers/TXFMParser.hpp>
#include <xsec/dsig/DSIGConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECError.hpp>
#include <xsec/dsig/DSIGXPathFilterExpr.hpp>
#include <xsec/dsig/DSIGXPathHere.hpp>
-
-#include <xercesc/util/Janitor.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/transformers/TXFMXPathFilter.hpp>
+#include <xsec/transformers/TXFMParser.hpp>
XERCES_CPP_NAMESPACE_USE
#ifdef XSEC_HAVE_XALAN
+#include "../utils/XSECDOMUtils.hpp"
+
+#include <xercesc/util/Janitor.hpp>
+
#if defined(_MSC_VER)
# pragma warning(disable: 4267)
#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=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMXSL.cpp Mon Jun 11 16:25:41 2018
@@ -26,9 +26,9 @@
*
*/
-#include <xsec/transformers/TXFMXSL.hpp>
#include <xsec/dsig/DSIGConstants.hpp>
#include <xsec/framework/XSECError.hpp>
+#include <xsec/transformers/TXFMXSL.hpp>
#ifdef XSEC_HAVE_XSLT
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECDOMUtils.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECDOMUtils.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECDOMUtils.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECDOMUtils.cpp Mon Jun 11 16:25:41 2018
@@ -28,10 +28,11 @@
// XSEC
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/xkms/XKMSConstants.hpp>
+#include "XSECDOMUtils.hpp"
+
// Xerces
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECNameSpaceExpander.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECNameSpaceExpander.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECNameSpaceExpander.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECNameSpaceExpander.cpp Mon Jun 11 16:25:41 2018
@@ -31,7 +31,8 @@
#include <xsec/utils/XSECNameSpaceExpander.hpp>
#include <xsec/dsig/DSIGConstants.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+
+#include "XSECDOMUtils.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECSOAPRequestorSimple.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECSOAPRequestorSimple.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECSOAPRequestorSimple.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECSOAPRequestorSimple.cpp Mon Jun 11 16:25:41 2018
@@ -30,13 +30,13 @@
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECSafeBuffer.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/utils/XSECSOAPRequestorSimple.hpp>
#include <xsec/xkms/XKMSConstants.hpp>
#ifdef XSEC_XKMS_ENABLED
-#include "../utils/XSECAutoPtr.hpp"
+#include "XSECAutoPtr.hpp"
+#include "XSECDOMUtils.hpp"
#include <stdio.h>
#include <string.h>
Modified: santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/XSECSafeBuffer.cpp Mon Jun 11 16:25:41 2018
@@ -31,10 +31,11 @@
// XSEC includes
#include <xsec/utils/XSECSafeBuffer.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/transformers/TXFMBase.hpp>
+#include "XSECDOMUtils.hpp"
+
#include <xercesc/util/XMLUniDefs.hpp>
XSEC_USING_XERCES(XMLString);
Modified: santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp Mon Jun 11 16:25:41 2018
@@ -32,12 +32,13 @@
#include <xsec/framework/XSECError.hpp>
#include <xsec/utils/XSECSafeBuffer.hpp>
#include <xsec/utils/XSECSOAPRequestorSimple.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
#ifdef XSEC_XKMS_ENABLED
+#include <xsec/xkms/XKMSConstants.hpp>
+
#include "../../utils/XSECAutoPtr.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
#define _WINSOCKAPI_
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp Mon Jun 11 16:25:41 2018
@@ -38,9 +38,9 @@
#include <xsec/transformers/TXFMBase64.hpp>
#include <xsec/transformers/TXFMSB.hpp>
#include <xsec/xenc/XENCEncryptionMethod.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include "../../utils/XSECAutoPtr.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
#include "XENCAlgorithmHandlerDefault.hpp"
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherDataImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherDataImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherDataImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherDataImpl.cpp Mon Jun 11 16:25:41 2018
@@ -27,14 +27,14 @@
*/
#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/framework/XSECEnv.hpp>
#include "XENCCipherDataImpl.hpp"
#include "XENCCipherValueImpl.hpp"
#include "XENCCipherReferenceImpl.hpp"
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECEnv.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherImpl.cpp Mon Jun 11 16:25:41 2018
@@ -28,7 +28,12 @@
// XSEC Includes
+#include <xsec/enc/XSECKeyInfoResolver.hpp>
+#include <xsec/enc/XSECCryptoException.hpp>
+#include <xsec/framework/XSECAlgorithmMapper.hpp>
+#include <xsec/framework/XSECAlgorithmHandler.hpp>
#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECEnv.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/XSECCryptoKey.hpp>
#include <xsec/transformers/TXFMChain.hpp>
@@ -38,12 +43,6 @@
#include <xsec/transformers/TXFMURL.hpp>
#include <xsec/transformers/TXFMDocObject.hpp>
#include <xsec/transformers/TXFMConcatChains.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/enc/XSECKeyInfoResolver.hpp>
-#include <xsec/enc/XSECCryptoException.hpp>
-#include <xsec/framework/XSECAlgorithmMapper.hpp>
-#include <xsec/framework/XSECAlgorithmHandler.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
#include <xsec/utils/XSECBinTXFMInputStream.hpp>
@@ -53,6 +52,7 @@
#include "XENCEncryptionMethodImpl.hpp"
#include "XENCAlgorithmHandlerDefault.hpp"
#include "../../utils/XSECAutoPtr.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/dom/DOMNode.hpp>
#include <xercesc/dom/DOMElement.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherReferenceImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherReferenceImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherReferenceImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherReferenceImpl.cpp Mon Jun 11 16:25:41 2018
@@ -26,7 +26,6 @@
*
*/
-#include <xsec/framework/XSECDefs.hpp>
#include <xsec/dsig/DSIGTransformList.hpp>
#include <xsec/dsig/DSIGReference.hpp>
#include <xsec/dsig/DSIGTransformList.hpp>
@@ -35,15 +34,17 @@
#include <xsec/dsig/DSIGTransformXPathFilter.hpp>
#include <xsec/dsig/DSIGTransformXSL.hpp>
#include <xsec/dsig/DSIGTransformC14n.hpp>
+#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECEnv.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/utils/XSECSafeBufferFormatter.hpp>
-#include <xsec/framework/XSECEnv.hpp>
+
+#include "XENCCipherReferenceImpl.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
-#include "XENCCipherReferenceImpl.hpp"
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherValueImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherValueImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherValueImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCCipherValueImpl.cpp Mon Jun 11 16:25:41 2018
@@ -29,13 +29,12 @@
// XSEC Includes
#include <xsec/framework/XSECDefs.hpp>
-
-#include "XENCCipherValueImpl.hpp"
-
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECEnv.hpp>
+#include "XENCCipherValueImpl.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
+
#include <xercesc/util/XMLUniDefs.hpp>
XERCES_CPP_NAMESPACE_USE
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedDataImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedDataImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedDataImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedDataImpl.cpp Mon Jun 11 16:25:41 2018
@@ -27,13 +27,12 @@
*/
#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECError.hpp>
#include "XENCCipherImpl.hpp"
#include "XENCEncryptedDataImpl.hpp"
#include "XENCCipherDataImpl.hpp"
-
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedKeyImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedKeyImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedKeyImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedKeyImpl.cpp Mon Jun 11 16:25:41 2018
@@ -27,14 +27,14 @@
*/
#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
#include "XENCCipherImpl.hpp"
#include "XENCEncryptedKeyImpl.hpp"
#include "XENCCipherDataImpl.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedTypeImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedTypeImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedTypeImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptedTypeImpl.cpp Mon Jun 11 16:25:41 2018
@@ -27,24 +27,23 @@
*
*/
+
+#include <xsec/dsig/DSIGReference.hpp>
#include <xsec/framework/XSECDefs.hpp>
+#include <xsec/framework/XSECEnv.hpp>
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/transformers/TXFMBase64.hpp>
+#include <xsec/transformers/TXFMChain.hpp>
+#include <xsec/transformers/TXFMSB.hpp>
+#include <xsec/transformers/TXFMC14n.hpp>
+#include <xsec/xenc/XENCEncryptedKey.hpp>
#include "XENCCipherImpl.hpp"
#include "XENCCipherDataImpl.hpp"
#include "XENCEncryptedTypeImpl.hpp"
#include "XENCEncryptionMethodImpl.hpp"
#include "../../utils/XSECAutoPtr.hpp"
-
-#include <xsec/xenc/XENCEncryptedKey.hpp>
-
-#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/transformers/TXFMBase64.hpp>
-#include <xsec/transformers/TXFMChain.hpp>
-#include <xsec/transformers/TXFMSB.hpp>
-#include <xsec/transformers/TXFMC14n.hpp>
-#include <xsec/framework/XSECEnv.hpp>
-#include <xsec/dsig/DSIGReference.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptionMethodImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptionMethodImpl.cpp?rev=1833341&r1=1833340&r2=1833341&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptionMethodImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCEncryptionMethodImpl.cpp Mon Jun 11 16:25:41 2018
@@ -28,13 +28,13 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/framework/XSECEnv.hpp>
#include "XENCEncryptionMethodImpl.hpp"
+#include "../../utils/XSECDOMUtils.hpp"
-#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
XERCES_CPP_NAMESPACE_USE