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 15:40:14 UTC

svn commit: r1833340 - in /santuario/xml-security-cpp/trunk/xsec/xkms: ./ impl/

Author: scantor
Date: Mon Jun 11 15:40:13 2018
New Revision: 1833340

URL: http://svn.apache.org/viewvc?rev=1833340&view=rev
Log:
Header cleanup.

Modified:
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSMessageFactory.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPendingRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPrototypeKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSQueryKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRequestAbstractType.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRespondWith.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResponseMechanism.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResultType.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSUnverifiedKeyBinding.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateRequest.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateResult.hpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSAuthenticationImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPendingRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRespondWithImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultTypeImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateRequestImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateResultImpl.cpp
    santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class XKMSLocateRequest;
 class XKMSValidateRequest;
 class XKMSRegisterRequest;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSCompoundResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+
 class XKMSLocateResult;
 class XKMSLocateRequest;
 class XKMSValidateResult;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class XKMSQueryKeyBinding;
 
 /**

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSLocateResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+
 class XKMSQueryKeyBinding;
 class XKMSUnverifiedKeyBinding;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSMessageFactory.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSMessageFactory.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSMessageFactory.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSMessageFactory.hpp Mon Jun 11 15:40:13 2018
@@ -32,11 +32,12 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSMessageAbstractType.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSMessageAbstractType.hpp>
+#include <xsec/xkms/XKMSResultType.hpp>
+
 class DSIGSignature;
 class XKMSCompoundRequest;
 class XKMSCompoundResult;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPendingRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPendingRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPendingRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPendingRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class XKMSQueryKeyBinding;
 
 /**

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPrototypeKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPrototypeKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPrototypeKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSPrototypeKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
+
 class XKMSValidityInterval;
 
 /**

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSQueryKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSQueryKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSQueryKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSQueryKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,9 +32,10 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 /**
  * @ingroup xkms

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 class DSIGSignature;
 class XKMSAuthentication;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRecoverResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,11 +32,12 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
+
 class XKMSKeyBinding;
 class XKMSUnverifiedKeyBinding;
 class XKMSRSAKeyPair;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class DSIGSignature;
 class XKMSAuthentication;
 class XKMSPrototypeKeyBinding;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRegisterResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,11 +32,12 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
+
 class XKMSKeyBinding;
 class XKMSUnverifiedKeyBinding;
 class XKMSRSAKeyPair;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,9 +32,10 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 /**
  * @ingroup xkms

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,11 +32,12 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
+
 class DSIGSignature;
 class XKMSAuthentication;
 class XKMSReissueKeyBinding;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSReissueResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSResultType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 class XKMSKeyBinding;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRequestAbstractType.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRequestAbstractType.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRequestAbstractType.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRequestAbstractType.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSMessageAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSMessageAbstractType.hpp>
+
 class XKMSRespondWith;
 class XKMSResponseMechanism;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRespondWith.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRespondWith.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRespondWith.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRespondWith.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSMessageAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSMessageAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResponseMechanism.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResponseMechanism.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResponseMechanism.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResponseMechanism.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSMessageAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSMessageAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResultType.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResultType.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResultType.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSResultType.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSMessageAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSMessageAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,9 +32,10 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 /**
  * @ingroup xkms

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 class DSIGSignature;
 class XKMSAuthentication;

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSRevokeResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include <xsec/xkms/XKMSResultType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 class XKMSKeyBinding;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class XKMSQueryKeyBinding;
 
 /**

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSStatusResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+
 class XKMSQueryKeyBinding;
 class XKMSUnverifiedKeyBinding;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSUnverifiedKeyBinding.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSUnverifiedKeyBinding.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSUnverifiedKeyBinding.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSUnverifiedKeyBinding.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
+
 /**
  * @ingroup xkms
  */

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateRequest.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateRequest.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateRequest.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateRequest.hpp Mon Jun 11 15:40:13 2018
@@ -32,10 +32,11 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSRequestAbstractType.hpp>
+
 class XKMSQueryKeyBinding;
 
 /**

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateResult.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateResult.hpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateResult.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/XKMSValidateResult.hpp Mon Jun 11 15:40:13 2018
@@ -32,11 +32,12 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/xkms/XKMSResultType.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include <xsec/xkms/XKMSResultType.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
+
 class XKMSKeyBinding;
 class XKMSUnverifiedKeyBinding;
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSAuthenticationImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSAuthenticationImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSAuthenticationImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSAuthenticationImpl.cpp Mon Jun 11 15:40:13 2018
@@ -26,23 +26,23 @@
  *
  */
 
+#include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-
-#include <xsec/dsig/DSIGReference.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSNotBoundAuthenticationImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 
-#include "../utils/XSECDOMUtils.hpp"
-
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,11 +29,11 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSCompoundRequestImpl.hpp"
 #include "XKMSLocateRequestImpl.hpp"
 #include "XKMSValidateRequestImpl.hpp"
@@ -42,6 +42,8 @@
 #include "XKMSReissueRequestImpl.hpp"
 #include "XKMSRecoverRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSCompoundResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,11 +29,11 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSCompoundResultImpl.hpp"
 #include "XKMSLocateResultImpl.hpp"
 #include "XKMSStatusResultImpl.hpp"
@@ -44,6 +44,8 @@
 #include "XKMSRecoverResultImpl.hpp"
 #include "XKMSResultImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp Mon Jun 11 15:40:13 2018
@@ -26,23 +26,24 @@
  *
  */
 
+#include <xsec/dsig/DSIGKeyInfoList.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/dsig/DSIGKeyInfoList.hpp>
 
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/Janitor.hpp>
+XERCES_CPP_NAMESPACE_USE
+
+#ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSKeyBindingAbstractTypeImpl.hpp"
 #include "XKMSUseKeyWithImpl.hpp"
 
-XERCES_CPP_NAMESPACE_USE
+#include <xsec/xkms/XKMSConstants.hpp>
 
-#ifdef XSEC_XKMS_ENABLED
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
 
 // --------------------------------------------------------------------------------
 //           Constructor/Destructor

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,15 +31,17 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
 #include "XKMSKeyBindingImpl.hpp"
 #include "XKMSStatusImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSLocateRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSLocateResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,14 +29,16 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSLocateResultImpl.hpp"
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp Mon Jun 11 15:40:13 2018
@@ -26,22 +26,25 @@
  *
  */
 
+#include <xsec/dsig/DSIGSignature.hpp>
+#include <xsec/dsig/DSIGReference.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/dsig/DSIGSignature.hpp>
-#include <xsec/dsig/DSIGReference.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-#include <xercesc/util/Janitor.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSMessageAbstractTypeImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <xercesc/util/Janitor.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,10 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/Janitor.hpp>
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSCompoundRequestImpl.hpp"
 #include "XKMSCompoundResultImpl.hpp"
@@ -57,6 +54,11 @@
 #include "XKMSReissueResultImpl.hpp"
 #include "XKMSReissueRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/Janitor.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSNotBoundAuthenticationImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPendingRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPendingRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPendingRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPendingRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSPendingRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,14 +29,16 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSPrototypeKeyBindingImpl.hpp"
 #include "XKMSValidityIntervalImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -30,14 +30,18 @@
 
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSQueryKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,14 +29,16 @@
 // XSEC Includes
 
 #include <xsec/framework/XSECDefs.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRSAKeyPairImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,14 +31,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRecoverKeyBindingImpl.hpp"
 #include "XKMSStatusImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -28,20 +28,21 @@
 
 // XSEC Includes
 
-#include <xsec/framework/XSECDefs.hpp>
-
 #include <xsec/dsig/DSIGReference.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRecoverRequestImpl.hpp"
 #include "XKMSRecoverKeyBindingImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRecoverResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -26,25 +26,27 @@
  *
  */
 
+#include <xsec/enc/XSECCryptoUtils.hpp>
+#include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECAlgorithmMapper.hpp>
 #include <xsec/framework/XSECAlgorithmHandler.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/enc/XSECCryptoUtils.hpp>
-#include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/xenc/XENCEncryptedData.hpp>
 #include <xsec/xenc/XENCEncryptionMethod.hpp>
 #include <xsec/xenc/XENCCipher.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSRecoverResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
 #include "XKMSRSAKeyPairImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -28,20 +28,21 @@
 
 // XSEC Includes
 
-#include <xsec/framework/XSECDefs.hpp>
-
 #include <xsec/dsig/DSIGReference.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSRegisterRequestImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSPrototypeKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRegisterResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -26,25 +26,27 @@
  *
  */
 
+#include <xsec/enc/XSECCryptoUtils.hpp>
+#include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECAlgorithmMapper.hpp>
 #include <xsec/framework/XSECAlgorithmHandler.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/enc/XSECCryptoUtils.hpp>
-#include <xsec/enc/XSECCryptoKey.hpp>
 #include <xsec/xenc/XENCEncryptedData.hpp>
 #include <xsec/xenc/XENCEncryptionMethod.hpp>
 #include <xsec/xenc/XENCCipher.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSRegisterResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
 #include "XKMSRSAKeyPairImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,14 +31,16 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
 #include "XKMSReissueKeyBindingImpl.hpp"
-#include "XKMSStatusImpl.hpp"
+#include "XKMSStatusImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -28,20 +28,21 @@
 
 // XSEC Includes
 
-#include <xsec/framework/XSECDefs.hpp>
-
 #include <xsec/dsig/DSIGReference.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSReissueRequestImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSReissueKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSReissueResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSReissueResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
 
 #include <xercesc/dom/DOM.hpp>
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,18 +31,20 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMNodeList.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 #include "XKMSRespondWithImpl.hpp"
 #include "XKMSResponseMechanismImpl.hpp"
 
-#include "../utils/XSECDOMUtils.hpp"
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMNodeList.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRespondWithImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRespondWithImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRespondWithImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRespondWithImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,16 +31,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/util/XMLUniDefs.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSRespondWithImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,16 +31,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/util/XMLUniDefs.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSResponseMechanismImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSResultImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultTypeImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultTypeImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultTypeImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSResultTypeImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,17 +29,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECException.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSResultTypeImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 
-#include "../utils/XSECDOMUtils.hpp"
-
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,14 +31,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRevokeKeyBindingImpl.hpp"
-#include "XKMSStatusImpl.hpp"
+#include "XKMSStatusImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -28,20 +28,21 @@
 
 // XSEC Includes
 
-#include <xsec/framework/XSECDefs.hpp>
-
 #include <xsec/dsig/DSIGReference.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/xkms/XKMSStatus.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRevokeRequestImpl.hpp"
 #include "XKMSRevokeKeyBindingImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
+#include <xsec/xkms/XKMSStatus.hpp>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSRevokeResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
+
+#include "../../utils/XSECDOMUtils.hpp"
 
 #include "XKMSRevokeResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
+
+#include <xsec/xkms/XKMSConstants.hpp>
 
 #include <xercesc/dom/DOM.hpp>
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,13 +31,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSStatusImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSStatusRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSStatusResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,14 +29,16 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSStatusResultImpl.hpp"
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp Mon Jun 11 15:40:13 2018
@@ -30,14 +30,16 @@
 
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
+#include <xercesc/dom/DOM.hpp>
+
+#include <xsec/xkms/XKMSConstants.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp Mon Jun 11 15:40:13 2018
@@ -31,15 +31,18 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
 
-#include <xercesc/dom/DOM.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSUseKeyWithImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
+#include <xercesc/dom/DOM.hpp>
+
 XERCES_CPP_NAMESPACE_USE
 
 // --------------------------------------------------------------------------------

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateRequestImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateRequestImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateRequestImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateRequestImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSValidateRequestImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateResultImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateResultImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateResultImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidateResultImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,14 +29,16 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECError.hpp>
 #include <xsec/framework/XSECEnv.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSValidateResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE

Modified: santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp?rev=1833340&r1=1833339&r2=1833340&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp Mon Jun 11 15:40:13 2018
@@ -29,13 +29,15 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/framework/XSECError.hpp>
-#include <xsec/utils/XSECDOMUtils.hpp>
-#include <xsec/xkms/XKMSConstants.hpp>
 
 #ifdef XSEC_XKMS_ENABLED
 
+#include "../../utils/XSECDOMUtils.hpp"
+
 #include "XKMSValidityIntervalImpl.hpp"
 
+#include <xsec/xkms/XKMSConstants.hpp>
+
 #include <xercesc/dom/DOM.hpp>
 
 XERCES_CPP_NAMESPACE_USE