The big reshuffle

14 files changed, 73 insertions, 25 deletions

diff --git a/project2/cgi/Jamfile.jam b/project2/cgi/Jamfile.jam
new file mode 100644
index 0000000..fe5a3d2
--- /dev/null
+++ b/project2/cgi/Jamfile.jam
@@ -0,0 +1,48 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+lib boost_filesystem : : <name>boost_filesystem ;
+lib boost_program_options : : <name>boost_program_options ;
+lib cgicc : : <name>cgicc ;
+lib fcgi : : <name>fcgi ;
+lib fcgi++ : : <name>fcgi++ ;
+
+lib p2web :
+	[ glob cgi*.cpp ]
+	:
+	<include>../libmisc
+	<library>cgicc
+	<library>libxmlpp
+	<library>../common//p2common
+	<library>boost_program_options
+	<library>boost_filesystem
+	<library>../xml//p2xml
+	: :
+	<library>..//p2parts
+	<library>cgicc
+	<library>../common//p2common
+	;
+
+exe p2cgi :
+	p2webCgi.cpp
+	:
+	<library>p2web
+	<include>../../libmisc
+	;
+
+exe p2fcgi :
+	p2webFCgi.cpp FCgiIO.cpp
+	fcgi++
+	fcgi
+	:
+	<library>p2web
+	<include>../../libmisc
+	;
+
+exe testCgi :
+	testCgi.cpp
+	:
+	<library>p2web
+	<include>../../libmisc
+	;
+
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index aa08559..c01e4ac 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -2,11 +2,11 @@
 #include <cgicc/Cgicc.h>
 #include <cgicc/HTTPHeader.h>
 #include "cgiEnvironment.h"
-#include "../iterate.h"
-#include "../logger.h"
+#include "iterate.h"
+#include "logger.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-#include "../ostreamWrapper.h"
+#include "ostreamWrapper.h"
 #include <boost/date_time/microsec_time_clock.hpp>
 #include <glibmm/regex.h>
 
diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h
index 2109a31..0f534e8 100644
--- a/project2/cgi/cgiAppEngine.h
+++ b/project2/cgi/cgiAppEngine.h
@@ -1,16 +1,16 @@
 #ifndef CGIAPPENGINE_H
 #define CGIAPPENGINE_H
 
-#include "../appEngine.h"
-#include "../task.h"
-#include "../paramChecker.h"
-#include "../commonObjects.h"
-#include "../uuid.h"
-#include "../taskHost.h"
-#include "../viewHost.h"
-#include "../transform.h"
-#include "../xmlPresenter.h"
-#include "../sessionContainer.h"
+#include "appEngine.h"
+#include "task.h"
+#include "paramChecker.h"
+#include "commonObjects.h"
+#include "uuid.h"
+#include "taskHost.h"
+#include "viewHost.h"
+#include "transform.h"
+#include "xmlPresenter.h"
+#include "sessionContainer.h"
 #include <boost/intrusive_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
 
diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp
index b8a2b93..89808e1 100644
--- a/project2/cgi/cgiCommon.cpp
+++ b/project2/cgi/cgiCommon.cpp
@@ -1,5 +1,5 @@
 #include "cgiCommon.h"
-#include "../logger.h"
+#include "logger.h"
 #include <libxml/tree.h>
 #include <glibmm/exception.h>
 #include <cgicc/CgiEnvironment.h>
diff --git a/project2/cgi/cgiEnvironment.cpp b/project2/cgi/cgiEnvironment.cpp
index 1382709..039ff98 100644
--- a/project2/cgi/cgiEnvironment.cpp
+++ b/project2/cgi/cgiEnvironment.cpp
@@ -1,6 +1,6 @@
 #include "cgiEnvironment.h"
-#include "../appEngine.h"
-#include "../exceptions.h"
+#include "appEngine.h"
+#include "exceptions.h"
 #include <map>
 #include <cgicc/Cgicc.h>
 
diff --git a/project2/cgi/cgiEnvironment.h b/project2/cgi/cgiEnvironment.h
index db39da8..fe99f5e 100644
--- a/project2/cgi/cgiEnvironment.h
+++ b/project2/cgi/cgiEnvironment.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include "../environment.h"
+#include "environment.h"
 #include <cgicc/CgiEnvironment.h>
 
 namespace cgicc {
diff --git a/project2/cgi/cgiStageCustomError.cpp b/project2/cgi/cgiStageCustomError.cpp
index bc53c23..b223323 100644
--- a/project2/cgi/cgiStageCustomError.cpp
+++ b/project2/cgi/cgiStageCustomError.cpp
@@ -1,7 +1,7 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
-#include "../logger.h"
+#include "logger.h"
 
 CgiApplicationEngine::CustomErrorStage::CustomErrorStage(const CgiEnvironment * env, const std::exception & ex) :
 	CgiApplicationEngine::ResponseStage(env),
diff --git a/project2/cgi/cgiStageCustomNotFound.cpp b/project2/cgi/cgiStageCustomNotFound.cpp
index e0c6bfc..9575e94 100644
--- a/project2/cgi/cgiStageCustomNotFound.cpp
+++ b/project2/cgi/cgiStageCustomNotFound.cpp
@@ -1,7 +1,7 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
-#include "../logger.h"
+#include "logger.h"
 
 CgiApplicationEngine::CustomNotFoundStage::CustomNotFoundStage(const CgiEnvironment * env, const ::XmlScriptParser::NotFound & notfound) :
 	CgiApplicationEngine::ResponseStage(env),
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index 1843905..5828831 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -1,6 +1,6 @@
 #include "cgiAppEngine.h"
 #include "cgiHttpHeader.h"
-#include "../logger.h"
+#include "logger.h"
 #include "cgiEnvironment.h"
 #include <cxxabi.h>
 
diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp
index 8359aa7..3407d0e 100644
--- a/project2/cgi/cgiStageDefaultNotFound.cpp
+++ b/project2/cgi/cgiStageDefaultNotFound.cpp
@@ -1,7 +1,7 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
-#include "../logger.h"
+#include "logger.h"
 
 static const Glib::ustring DefaultNotFoundStageResp("notfound");
 
diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp
index 348cbb9..92595ef 100644
--- a/project2/cgi/cgiStageInitial.cpp
+++ b/project2/cgi/cgiStageInitial.cpp
@@ -1,6 +1,6 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
-#include "../exceptions.h"
+#include "exceptions.h"
 
 StaticMessageException(EmptyRequestURL, "Request URL cannot be empty");
 
diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp
index afef7ab..c17efac 100644
--- a/project2/cgi/cgiStageRequest.cpp
+++ b/project2/cgi/cgiStageRequest.cpp
@@ -1,7 +1,7 @@
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
-#include "../xmlObjectLoader.h"
+#include "xmlObjectLoader.h"
 #include <boost/foreach.hpp>
 
 CgiApplicationEngine::RequestStage::RequestStage(const CgiEnvironment * e, const boost::filesystem::path & path) :
diff --git a/project2/cgi/p2webCgi.cpp b/project2/cgi/p2webCgi.cpp
index 6168819..940717b 100644
--- a/project2/cgi/p2webCgi.cpp
+++ b/project2/cgi/p2webCgi.cpp
@@ -1,5 +1,5 @@
 #include "cgiCommon.h"
-#include "../xmlObjectLoader.h"
+#include "xmlObjectLoader.h"
 #include <boost/bind.hpp>
 
 int
diff --git a/project2/cgi/p2webFCgi.cpp b/project2/cgi/p2webFCgi.cpp
index 9a47b24..c193c1b 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 "xmlObjectLoader.h"
 #include <boost/bind.hpp>
 
 time_t lastPeriodic = 0;