#include <fstream>
#include <sstream>
-#include <log4cpp/Category.hh>
#include <xercesc/util/Base64.hpp>
+#include <xmltooling/logging.h>
#include <xmltooling/util/NDC.h>
#include <xmltooling/util/TemplateEngine.h>
using namespace opensaml::saml2md;
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
namespace opensaml {
class SAML_DLLLOCAL SAML1POSTEncoder : public MessageEncoder
{
public:
- SAML1POSTEncoder(const DOMElement* e);
+ SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns);
virtual ~SAML1POSTEncoder() {}
long encode(
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
string m_template;
};
- MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const DOMElement* const & e)
+ MessageEncoder* SAML_DLLLOCAL SAML1POSTEncoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
{
- return new SAML1POSTEncoder(e);
+ return new SAML1POSTEncoder(p.first, p.second);
}
};
};
static const XMLCh _template[] = UNICODE_LITERAL_8(t,e,m,p,l,a,t,e);
-SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e)
+SAML1POSTEncoder::SAML1POSTEncoder(const DOMElement* e, const XMLCh* ns)
{
if (e) {
- auto_ptr_char t(e->getAttributeNS(NULL, _template));
- if (t.get())
+ auto_ptr_char t(e->getAttributeNS(ns, _template));
+ if (t.get() && *t.get())
m_template = t.get();
}
if (m_template.empty())
const char* destination,
const EntityDescriptor* recipient,
const char* relayState,
+ const ArtifactGenerator* artifactGenerator,
const Credential* credential,
const XMLCh* signatureAlg,
const XMLCh* digestAlg