projects
/
shibboleth
/
opensaml2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert logging to log4shib via compile time switch.
[shibboleth/opensaml2.git]
/
saml
/
saml2
/
binding
/
impl
/
SAML2RedirectEncoder.cpp
diff --git
a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
index
9135c8d
..
d0ed6d0
100644
(file)
--- a/
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
+++ b/
saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
@@
-28,8
+28,8
@@
#include <fstream>
#include <sstream>
#include <fstream>
#include <sstream>
-#include <log4cpp/Category.hh>
#include <xercesc/util/Base64.hpp>
#include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/URLEncoder.h>
#include <xmltooling/io/HTTPResponse.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/URLEncoder.h>
@@
-38,8
+38,8
@@
using namespace opensaml::saml2p;
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
using namespace std;
namespace opensaml {
@@
-47,7
+47,7
@@
namespace opensaml {
class SAML_DLLLOCAL SAML2RedirectEncoder : public MessageEncoder
{
public:
class SAML_DLLLOCAL SAML2RedirectEncoder : public MessageEncoder
{
public:
- SAML2RedirectEncoder(
const DOMElement* e
) {}
+ SAML2RedirectEncoder() {}
virtual ~SAML2RedirectEncoder() {}
bool isCompact() const {
virtual ~SAML2RedirectEncoder() {}
bool isCompact() const {
@@
-60,15
+60,16
@@
namespace opensaml {
const char* destination,
const EntityDescriptor* recipient=NULL,
const char* relayState=NULL,
const char* destination,
const EntityDescriptor* recipient=NULL,
const char* relayState=NULL,
+ const ArtifactGenerator* artifactGenerator=NULL,
const Credential* credential=NULL,
const XMLCh* signatureAlg=NULL,
const XMLCh* digestAlg=NULL
) const;
};
const Credential* credential=NULL,
const XMLCh* signatureAlg=NULL,
const XMLCh* digestAlg=NULL
) const;
};
- MessageEncoder* SAML_DLLLOCAL SAML2RedirectEncoderFactory(const
DOMElement* const & e
)
+ MessageEncoder* SAML_DLLLOCAL SAML2RedirectEncoderFactory(const
pair<const DOMElement*,const XMLCh*>& p
)
{
{
- return new SAML2RedirectEncoder(
e
);
+ return new SAML2RedirectEncoder();
}
};
};
}
};
};
@@
-79,6
+80,7
@@
long SAML2RedirectEncoder::encode(
const char* destination,
const EntityDescriptor* recipient,
const char* relayState,
const char* destination,
const EntityDescriptor* recipient,
const char* relayState,
+ const ArtifactGenerator* artifactGenerator,
const Credential* credential,
const XMLCh* signatureAlg,
const XMLCh* digestAlg
const Credential* credential,
const XMLCh* signatureAlg,
const XMLCh* digestAlg