Remove straggling references to XML and configuration from recent changes

10 files changed, 12 insertions, 22 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 4d91069..f94597c 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -119,7 +119,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 {
 	if (!o || o->Environment()) {
 		// Environment set up by web server
-		p->addNewRowSet("environment", env()->xmlPrefix);
+		p->addNewRowSet("environment", env()->scriptNamespacePrefix);
 		// Server stuff
 		addEnvToPresenter(p, "servername", &cgicc::CgiEnvironment::getServerName);
 		addEnvToPresenter(p, "serversoftware", &cgicc::CgiEnvironment::getServerSoftware);
@@ -134,7 +134,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 	
 	if (!o || o->URL()) {
 		// URL elements
-		p->addNewRowSet("uriElems", env()->xmlPrefix);
+		p->addNewRowSet("uriElems", env()->scriptNamespacePrefix);
 		p->addAttribute("full", _env->getRedirectURL());
 		BOOST_FOREACH(std::string s, _env->elems) {
 			p->addNewRow("uriElem");
@@ -146,7 +146,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 
 	if (!o || o->Parameters()) {
 		// Parameters
-		p->addNewRowSet("params", env()->xmlPrefix);
+		p->addNewRowSet("params", env()->scriptNamespacePrefix);
 		BOOST_FOREACH(cgicc::FormEntry fe, _env->cgi->getElements()) {
 			p->addNewRow("param");
 			p->addAttribute("name", fe.getName());
@@ -174,7 +174,7 @@ CgiApplicationEngine::addAppData(const MultiRowSetPresenter * p, OutputOptionsPt
 	}
 	if (!o || o->Session()) {
 		// Sessions variables
-		p->addNewRowSet("session", env()->xmlPrefix);
+		p->addNewRowSet("session", env()->scriptNamespacePrefix);
 		p->addAttribute("id", cursession->ID.str());
 		cursession->ForeachValue(boost::bind(&CgiApplicationEngine::addVarToPresenter, this, p, _1, _2));
 		p->finishRowSet();
@@ -182,7 +182,7 @@ CgiApplicationEngine::addAppData(const MultiRowSetPresenter * p, OutputOptionsPt
 
 	if (!o || o->Timing()) {
 		// Timing info
-		p->addNewRowSet("timing", env()->xmlPrefix);
+		p->addNewRowSet("timing", env()->scriptNamespacePrefix);
 		p->addAttribute("start", startTime);
 		if (!endTime.is_not_a_date_time()) {
 			p->addAttribute("end", endTime);
diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h
index f4b3896..d4295de 100644
--- a/project2/cgi/cgiAppEngine.h
+++ b/project2/cgi/cgiAppEngine.h
@@ -21,13 +21,9 @@ namespace cgicc {
 	class HTTPHeader;
 	class CgiEnvironment;
 }
-namespace xmlpp {
-	class Document;
-}
 
 class CgiApplicationEngine : public ApplicationEngine, public TransformChainLink {
 	public:
-		typedef boost::shared_ptr<xmlpp::Document> XmlDocPtr;
 		typedef boost::shared_ptr<cgicc::HTTPHeader> HttpHeaderPtr;
 
 		CgiApplicationEngine(const CgiEnvironment *, std::ostream &);
@@ -43,7 +39,6 @@ class CgiApplicationEngine : public ApplicationEngine, public TransformChainLink
 	private:
 		mutable boost::posix_time::ptime startTime;
 		mutable boost::posix_time::ptime endTime;
-		void loadEngineSection(const xmlpp::Element *) const;
 		SessionContainerPtr sessionsContainer;
 		// Helpers
 		void addVarToPresenter(const MultiRowSetPresenter * p, const Glib::ustring & name, const VariableType &) const;
diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp
index 3664e9f..7559ea7 100644
--- a/project2/cgi/cgiCommon.cpp
+++ b/project2/cgi/cgiCommon.cpp
@@ -1,7 +1,6 @@
 #include <pch.hpp>
 #include "cgiCommon.h"
 #include "logger.h"
-#include <libxml/tree.h>
 #include <glibmm/exception.h>
 #include <cgicc/CgiEnvironment.h>
 #include <cgicc/HTTPContentHeader.h>
diff --git a/project2/cgi/cgiOutputOptions.h b/project2/cgi/cgiOutputOptions.h
index 07b7598..4a4f1c8 100644
--- a/project2/cgi/cgiOutputOptions.h
+++ b/project2/cgi/cgiOutputOptions.h
@@ -5,10 +5,6 @@
 #include "options.h"
 #include "variables.h"
 
-namespace xmlpp {
-	class Element;
-}
-
 class OutputOptions : public IntrusivePtrBase {
 	public:
 		OutputOptions(ScriptNodePtr);
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index 82d7b2e..ad27d2d 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -29,8 +29,8 @@ CgiApplicationEngine::DefaultErrorStage::getHeader() const
 CgiApplicationEngine::NextStage
 CgiApplicationEngine::DefaultErrorStage::run()
 {
-	pres->addNamedValue("error-type", e->xmlPrefix, buf);
-	pres->addNamedValue("error-what", e->xmlPrefix, what.c_str());
+	pres->addNamedValue("error-type", e->scriptNamespacePrefix, buf);
+	pres->addNamedValue("error-what", e->scriptNamespacePrefix, what.c_str());
 	return NextStage(NULL, this, pres.get(), pres.get());
 }
 
diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp
index d05c92b..be32658 100644
--- a/project2/cgi/cgiStageDefaultNotFound.cpp
+++ b/project2/cgi/cgiStageDefaultNotFound.cpp
@@ -23,7 +23,7 @@ CgiApplicationEngine::DefaultNotFoundStage::getHeader() const
 CgiApplicationEngine::NextStage
 CgiApplicationEngine::DefaultNotFoundStage::run()
 {
-	pres->addNamedValue("missing-resource", e->xmlPrefix, nf.what());
+	pres->addNamedValue("missing-resource", e->scriptNamespacePrefix, nf.what());
 	return NextStage(NULL, this, pres.get(), pres.get());
 }
 
diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp
index 99ca956..ac8516b 100644
--- a/project2/cgi/cgiStageRequest.cpp
+++ b/project2/cgi/cgiStageRequest.cpp
@@ -2,7 +2,7 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
-#include "xmlObjectLoader.h"
+#include "scriptLoader.h"
 #include <boost/foreach.hpp>
 
 CgiApplicationEngine::RequestStage::RequestStage(const CgiEnvironment * e, ScriptReaderPtr s) :
diff --git a/project2/cgi/p2webCgi.cpp b/project2/cgi/p2webCgi.cpp
index be48f4f..0248df6 100644
--- a/project2/cgi/p2webCgi.cpp
+++ b/project2/cgi/p2webCgi.cpp
@@ -1,5 +1,5 @@
 #include "cgiCommon.h"
-#include "xmlObjectLoader.h"
+#include "scriptLoader.h"
 #include <boost/bind.hpp>
 
 int
diff --git a/project2/cgi/p2webFCgi.cpp b/project2/cgi/p2webFCgi.cpp
index 72dfa44..3b833ed 100644
--- a/project2/cgi/p2webFCgi.cpp
+++ b/project2/cgi/p2webFCgi.cpp
@@ -1,6 +1,6 @@
 #include "cgiCommon.h"
 #include "FCgiIO.h"
-#include "xmlObjectLoader.h"
+#include "scriptLoader.h"
 #include <boost/bind.hpp>
 
 time_t lastPeriodic = 0;
diff --git a/project2/cgi/pch.hpp b/project2/cgi/pch.hpp
index ff0b175..df744a4 100644
--- a/project2/cgi/pch.hpp
+++ b/project2/cgi/pch.hpp
@@ -10,7 +10,7 @@
 #include "exceptions.h"
 #include "iterate.h"
 #include "logger.h"
-#include "xmlObjectLoader.h"
+#include "scriptLoader.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include "options.h"