#include "internal.h"
#include "exceptions.h"
+#include "logging.h"
#include "XMLToolingConfig.h"
#include "encryption/Encryption.h"
#include "encryption/Encrypter.h"
+#include "io/HTTPRequest.h"
+#include "io/HTTPResponse.h"
#include "impl/UnknownElement.h"
#include "security/TrustEngine.h"
#include "security/OpenSSLCryptoX509CRL.h"
#endif
#include <stdexcept>
-#include <curl/curl.h>
-#include <log4cpp/Category.hh>
-#include <log4cpp/PropertyConfigurator.hh>
-#include <log4cpp/OstreamAppender.hh>
+#if defined(XMLTOOLING_LOG4SHIB)
+# include <log4shib/PropertyConfigurator.hh>
+# include <log4shib/OstreamAppender.hh>
+#elif defined(XMLTOOLING_LOG4CPP)
+# include <log4cpp/PropertyConfigurator.hh>
+# include <log4cpp/OstreamAppender.hh>
+#endif
#include <xercesc/util/PlatformUtils.hpp>
#ifndef XMLTOOLING_NO_XMLSEC
- #include <xsec/framework/XSECProvider.hpp>
- #include <openssl/err.h>
+# include <curl/curl.h>
+# include <openssl/err.h>
+# include <xsec/framework/XSECProvider.hpp>
#endif
using namespace soap11;
using namespace xmlencryption;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
DECL_XMLTOOLING_EXCEPTION_FACTORY(XMLParserException,xmltooling);
return true;
}
+#ifndef XMLTOOLING_LITE
void XMLToolingConfig::setReplayCache(ReplayCache* replayCache)
{
delete m_replayCache;
m_replayCache = replayCache;
}
+#endif
void XMLToolingConfig::setTemplateEngine(TemplateEngine* templateEngine)
{
try {
log.debug("library initialization started");
+#ifndef XMLTOOLING_NO_XMLSEC
if (curl_global_init(CURL_GLOBAL_ALL)) {
log.fatal("failed to initialize libcurl, OpenSSL, or Winsock");
return false;
}
log.debug("libcurl %s initialization complete", LIBCURL_VERSION);
+#endif
XMLPlatformUtils::Initialize();
log.debug("Xerces initialization complete");
registerCredentialResolvers();
registerTrustEngines();
registerXMLAlgorithms();
-#endif
registerSOAPTransports();
initSOAPTransports();
registerStorageServices();
-
- m_urlEncoder = new URLEncoder();
-#ifndef XMLTOOLING_NO_XMLSEC
m_keyInfoResolver = KeyInfoResolverManager.newPlugin(INLINE_KEYINFO_RESOLVER,NULL);
#endif
+
+ m_urlEncoder = new URLEncoder();
// Register xml:id as an ID attribute.
static const XMLCh xmlid[] = UNICODE_LITERAL_2(i,d);
}
catch (const xercesc::XMLException&) {
log.fatal("caught exception while initializing Xerces");
+#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
+#endif
return false;
}
XMLToolingException::deregisterFactories();
AttributeExtensibleXMLObject::deregisterIDAttributes();
+#ifndef XMLTOOLING_NO_XMLSEC
StorageServiceManager.deregisterFactories();
termSOAPTransports();
SOAPTransportManager.deregisterFactories();
-
-#ifndef XMLTOOLING_NO_XMLSEC
TrustEngineManager.deregisterFactories();
CredentialResolverManager.deregisterFactories();
KeyInfoResolverManager.deregisterFactories();
delete m_keyInfoResolver;
m_keyInfoResolver = NULL;
-#endif
delete m_replayCache;
m_replayCache = NULL;
-
+#endif
+
delete m_templateEngine;
m_templateEngine = NULL;
m_lock=NULL;
XMLPlatformUtils::Terminate();
+#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
-
- #ifdef _DEBUG
+#endif
+#ifdef _DEBUG
xmltooling::NDC ndc("term");
#endif
Category::getInstance(XMLTOOLING_LOGCAT".XMLToolingConfig").info("library shutdown complete");
unsigned long code=ERR_get_error_line_data(&file,&line,&data,&flags);
while (code) {
Category& log=Category::getInstance("OpenSSL");
- log.errorStream() << "error code: " << code << " in " << file << ", line " << line << CategoryStream::ENDLINE;
+ log.errorStream() << "error code: " << code << " in " << file << ", line " << line << logging::eol;
if (data && (flags & ERR_TXT_STRING))
- log.errorStream() << "error data: " << data << CategoryStream::ENDLINE;
+ log.errorStream() << "error data: " << data << logging::eol;
code=ERR_get_error_line_data(&file,&line,&data,&flags);
}
}