Implemented custom xercesc::DOMDocument deleter

* pointers to xercesc::DOMDocument were manually released
** this is now solved using a custom deleter for the appropriate std::unqiue_ptr template specialization
* added matching factory method to DomDocumentCache
* updated external function implementations accordingly
** "constructDocument" is now expected to return a DomDocumentCache::document_ptr instance
* updated TransformerFacade accordingly
* this change was implemented to get rid of the manual memory management required by xalan / xerces

10 files changed, 40 insertions, 71 deletions

diff --git a/src/function/external_text_formatter.cc b/src/function/external_text_formatter.cc
index e7ab1a2..a86c71b 100644
--- a/src/function/external_text_formatter.cc
+++ b/src/function/external_text_formatter.cc
@@ -2,9 +2,6 @@
 
 #include <xalanc/XSLT/XSLTInputSource.hpp>
 
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 
 #include <boost/process.hpp>
@@ -42,16 +39,12 @@ inline xercesc::DOMNode* importDocumentElement(
 
 namespace InputXSLT {
 
-xercesc::DOMDocument* FunctionExternalTextFormatter::constructDocument(
+DomDocumentCache::document_ptr FunctionExternalTextFormatter::constructDocument(
 	boost::filesystem::path formatterPath,
 	std::string             stdinText
 ) {
-	xercesc::DOMDocument* const domDocument(
-		xercesc::DOMImplementation::getImplementation()->createDocument(
-			nullptr,
-			*XercesStringGuard<XMLCh>("content"),
-			nullptr
-		)
+	DomDocumentCache::document_ptr domDocument(
+		DomDocumentCache::createDocument()
 	);
 
 	xercesc::DOMNode* const rootNode(
@@ -78,14 +71,17 @@ xercesc::DOMDocument* FunctionExternalTextFormatter::constructDocument(
 
 	boost::process::status status = formatterProcess.wait();
 
-	ResultNodeFacade result(domDocument, rootNode, "output");
+	ResultNodeFacade result(domDocument.get(), rootNode, "output");
 	result.setAttribute("formatter", formatterPath.filename().string());
 	result.setAttribute("code",      std::to_string(status.exit_status()));
 
 	if ( status.exited() ) {
 		try {
 			result.setContent(
-				importDocumentElement(outputStream, domDocument)->getChildNodes()
+				importDocumentElement(
+					outputStream,
+					domDocument.get()
+				)->getChildNodes()
 			);
 
 			result.setAttribute("result", "success");
diff --git a/src/function/external_text_formatter.h b/src/function/external_text_formatter.h
index 4a2fb7e..23e6ab9 100644
--- a/src/function/external_text_formatter.h
+++ b/src/function/external_text_formatter.h
@@ -18,7 +18,7 @@ class FunctionExternalTextFormatter : public FunctionBase<
 	protected:
 		friend FunctionBase;
 
-		xercesc::DOMDocument* constructDocument(
+		DomDocumentCache::document_ptr constructDocument(
 			boost::filesystem::path,
 			std::string
 		);
diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc
index d5357e8..ad82217 100644
--- a/src/function/read_directory.cc
+++ b/src/function/read_directory.cc
@@ -1,29 +1,21 @@
 #include "read_directory.h"
 
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
-
 #include "support/xerces_string_guard.h"
 #include "support/dom/result_node_facade.h"
 
 namespace InputXSLT {
 
-xercesc::DOMDocument* FunctionReadDirectory::constructDocument(
+DomDocumentCache::document_ptr FunctionReadDirectory::constructDocument(
 	boost::filesystem::path directoryPath) {
-	xercesc::DOMDocument* const domDocument(
-		xercesc::DOMImplementation::getImplementation()->createDocument(
-			nullptr,
-			*XercesStringGuard<XMLCh>("content"),
-			nullptr
-		)
+	DomDocumentCache::document_ptr domDocument(
+		DomDocumentCache::createDocument()
 	);
 
 	xercesc::DOMNode* const rootNode(
 		domDocument->getDocumentElement()
 	);
 
-	ResultNodeFacade result(domDocument, rootNode, "directory");
+	ResultNodeFacade result(domDocument.get(), rootNode, "directory");
 	result.setAttribute("path", directoryPath.string());
 
 	if ( boost::filesystem::is_directory(directoryPath) ) {
@@ -34,7 +26,7 @@ xercesc::DOMDocument* FunctionReadDirectory::constructDocument(
 		FilesystemContext::iterate(
 			directoryPath,
 			[&domDocument, &resultNode](const boost::filesystem::path& p) {
-			ResultNodeFacade result(domDocument, resultNode, "entry");
+			ResultNodeFacade result(domDocument.get(), resultNode, "entry");
 
 			switch ( boost::filesystem::status(p).type() ) {
 				case boost::filesystem::regular_file: {
diff --git a/src/function/read_directory.h b/src/function/read_directory.h
index 898132a..59ece1a 100644
--- a/src/function/read_directory.h
+++ b/src/function/read_directory.h
@@ -17,7 +17,8 @@ class FunctionReadDirectory : public FunctionBase<
 	protected:
 		friend FunctionBase;
 
-		xercesc::DOMDocument* constructDocument(boost::filesystem::path);
+		DomDocumentCache::document_ptr constructDocument(
+			boost::filesystem::path);
 
 };
 
diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index f27a38e..cb1e57f 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -1,8 +1,5 @@
 #include "read_file.h"
 
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/framework/LocalFileInputSource.hpp>
 
@@ -62,21 +59,17 @@ boost::optional<std::string> readPlainFile(
 
 namespace InputXSLT {
 
-xercesc::DOMDocument* FunctionReadFile::constructDocument(
+DomDocumentCache::document_ptr FunctionReadFile::constructDocument(
 	boost::filesystem::path filePath) {
-	xercesc::DOMDocument* const domDocument(
-		xercesc::DOMImplementation::getImplementation()->createDocument(
-			nullptr,
-			*XercesStringGuard<XMLCh>("content"),
-			nullptr
-		)
+	DomDocumentCache::document_ptr domDocument(
+		DomDocumentCache::createDocument()
 	);
 
 	xercesc::DOMNode* const rootNode(
 		domDocument->getDocumentElement()
 	);
 
-	ResultNodeFacade result(domDocument, rootNode, "file");
+	ResultNodeFacade result(domDocument.get(), rootNode, "file");
 	result.setAttribute("path", filePath.string());
 
 	if ( boost::filesystem::is_regular_file(filePath) ) {
@@ -84,7 +77,10 @@ xercesc::DOMDocument* FunctionReadFile::constructDocument(
 			if ( isXmlFile(filePath) ) {
 				result.setAttribute("type", "xml");
 
-				if ( auto importedNode = readXmlFile(filePath, domDocument) ) {
+				if ( auto importedNode = readXmlFile(
+					filePath,
+					domDocument.get()) 
+				) {
 					result.setContent(*importedNode);
 
 					result.setAttribute("result", "success");
diff --git a/src/function/read_file.h b/src/function/read_file.h
index fdd70ac..3026c79 100644
--- a/src/function/read_file.h
+++ b/src/function/read_file.h
@@ -17,7 +17,8 @@ class FunctionReadFile : public FunctionBase<
 	protected:
 		friend FunctionBase;
 
-		xercesc::DOMDocument* constructDocument(boost::filesystem::path);
+		DomDocumentCache::document_ptr constructDocument(
+			boost::filesystem::path);
 
 };
 
diff --git a/src/function/transform.cc b/src/function/transform.cc
index e53b55f..c97897e 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -2,10 +2,6 @@
 
 #include <xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp>
 
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
-
 #include "transformer_facade.h"
 #include "support/xerces_string_guard.h"
 #include "support/dom/result_node_facade.h"
@@ -30,28 +26,24 @@ inline void handleErrors(
 
 namespace InputXSLT {
 
-xercesc::DOMDocument* FunctionTransform::constructDocument(
+DomDocumentCache::document_ptr FunctionTransform::constructDocument(
 	xalan::XSLTInputSource  inputSource,
 	xalan::XSLTInputSource  transformationSource
 ) {
-	xercesc::DOMDocument* const domDocument(
-		xercesc::DOMImplementation::getImplementation()->createDocument(
-			nullptr,
-			*XercesStringGuard<XMLCh>("content"),
-			nullptr
-		)
+	DomDocumentCache::document_ptr domDocument(
+		DomDocumentCache::createDocument()
 	);
 
 	xercesc::DOMElement* const rootElement(
 		domDocument->getDocumentElement()
 	);
 
-	ResultNodeFacade result(domDocument, rootElement, "transformation");
+	ResultNodeFacade result(domDocument.get(), rootElement, "transformation");
 	TransformerFacade transformer(this->include_resolver_);
 
 	try {
 		xalan::FormatterToXercesDOM targetFormatter(
-			domDocument,
+			domDocument.get(),
 			result.getResultElement()
 		);
 
diff --git a/src/function/transform.h b/src/function/transform.h
index b8e733d..95acba3 100644
--- a/src/function/transform.h
+++ b/src/function/transform.h
@@ -18,7 +18,7 @@ class FunctionTransform : public FunctionBase<
 	protected:
 		friend FunctionBase;
 
-		xercesc::DOMDocument* constructDocument(
+		DomDocumentCache::document_ptr constructDocument(
 			xalan::XSLTInputSource,
 			xalan::XSLTInputSource
 		);
diff --git a/src/function/write_file.cc b/src/function/write_file.cc
index 024a87a..872160b 100644
--- a/src/function/write_file.cc
+++ b/src/function/write_file.cc
@@ -5,10 +5,6 @@
 #include <xalanc/XMLSupport/FormatterToXML.hpp>
 #include <xalanc/XMLSupport/FormatterTreeWalker.hpp>
 
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
-
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
@@ -34,11 +30,10 @@ bool serializeNodeToFile(
 			if ( contentType == xalan::XalanNode::TEXT_NODE ) {
 				file << InputXSLT::toString(contentNode->getNodeValue());
 			} else {
-				xalan::XalanStdOutputStream outputStream(file);
+				xalan::XalanStdOutputStream         outputStream(file);
 				xalan::XalanOutputStreamPrintWriter outputWriter(outputStream);
-
-				xalan::FormatterToXML formatter(outputWriter);
-				xalan::FormatterTreeWalker walker(formatter);
+				xalan::FormatterToXML               formatter(outputWriter);
+				xalan::FormatterTreeWalker          walker(formatter);
 
 				formatter.startDocument();
 
@@ -62,23 +57,19 @@ bool serializeNodeToFile(
 
 namespace InputXSLT {
 
-xercesc::DOMDocument* FunctionWriteFile::constructDocument(
+DomDocumentCache::document_ptr FunctionWriteFile::constructDocument(
 	boost::filesystem::path filePath,
 	xalan::XalanNode* const contentNode
 ) {
-	xercesc::DOMDocument* const domDocument(
-		xercesc::DOMImplementation::getImplementation()->createDocument(
-			nullptr,
-			*XercesStringGuard<XMLCh>("content"),
-			nullptr
-		)
+	DomDocumentCache::document_ptr domDocument(
+		DomDocumentCache::createDocument()
 	);
 
 	xercesc::DOMNode* const rootNode(
 		domDocument->getDocumentElement()
 	);
 
-	ResultNodeFacade result(domDocument, rootNode, "file");
+	ResultNodeFacade result(domDocument.get(), rootNode, "file");
 	result.setAttribute("path", filePath.string());
 
 	if ( contentNode != nullptr ) {
diff --git a/src/function/write_file.h b/src/function/write_file.h
index 5fd9f3e..c1d6100 100644
--- a/src/function/write_file.h
+++ b/src/function/write_file.h
@@ -16,7 +16,7 @@ class FunctionWriteFile : public FunctionBase<
 	protected:
 		friend FunctionBase;
 
-		xercesc::DOMDocument* constructDocument(
+		DomDocumentCache::document_ptr constructDocument(
 			boost::filesystem::path,
 			xalan::XalanNode* const
 		);