/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "internal.h"
#include "exceptions.h"
+#include "logging.h"
#include "soap/SOAP.h"
#include "soap/SOAPClient.h"
#include "util/XMLHelper.h"
#include "validation/ValidatorSuite.h"
#include <sstream>
-#include <log4cpp/Category.hh>
using namespace soap11;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
SOAPClient::~SOAPClient()
{
- reset();
+ delete m_transport;
}
void SOAPClient::reset()
m_transport=NULL;
}
-void SOAPClient::send(const Envelope* env, const KeyInfoSource& peer, const char* endpoint)
+void SOAPClient::send(const Envelope& env, const SOAPTransport::Address& addr)
{
// Prepare a transport object.
- const char* pch = strchr(endpoint,':');
+ const char* pch = strchr(addr.m_endpoint,':');
if (!pch)
throw IOException("SOAP endpoint was not a URL.");
- string scheme(endpoint, pch-endpoint);
- m_transport = XMLToolingConfig::getConfig().SOAPTransportManager.newPlugin(scheme.c_str(), make_pair(&peer,endpoint));
+ string scheme(addr.m_endpoint, pch-addr.m_endpoint);
+ m_transport = XMLToolingConfig::getConfig().SOAPTransportManager.newPlugin(scheme.c_str(), addr);
prepareTransport(*m_transport);
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient");
+ if (log.isDebugEnabled())
+ log.debugStream() << "marshalled envelope: " << env << logging::eol;
+
// Serialize envelope.
stringstream s;
- s << *env;
+ s << env;
// Send to peer.
m_transport->send(s);
if (!out)
return NULL; // nothing yet
+ // Check content type.
+ string s = m_transport->getContentType();
+ if (s.find("text/xml") == string::npos)
+ throw IOException("Incorrect content type ($1) for SOAP response.", params(1,s.c_str() ? s.c_str() : "none"));
+
// Parse and bind the document into an XMLObject.
DOMDocument* doc = (m_validate ? XMLToolingConfig::getConfig().getValidatingParser()
: XMLToolingConfig::getConfig().getParser()).parse(out);
XercesJanitor<DOMDocument> janitor(doc);
+
+ Category& log = Category::getInstance(XMLTOOLING_LOGCAT".SOAPClient");
+ if (log.isDebugEnabled())
+ log.debugStream() << "received XML: " << *(doc->getDocumentElement()) << logging::eol;
+
auto_ptr<XMLObject> xmlObject(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
janitor.release();
if (!m_validate)