The big reshuffle

185 files changed, 338 insertions, 286 deletions

diff --git a/project2/Jamfile.jam b/project2/Jamfile.jam
index 96acca0..e0797a3 100644
--- a/project2/Jamfile.jam
+++ b/project2/Jamfile.jam
@@ -1,241 +1,32 @@
 import package ;
 import feature : feature ;
 
-alias glibmm : : : :
-	<cflags>"`pkg-config --cflags glibmm-2.4`"
-	<linkflags>"`pkg-config --libs glibmm-2.4`"
-	;
-
-alias libxmlpp : : : :
-	<cflags>"`pkg-config --cflags libxml++-2.6`"
-	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
-alias libxslt : : : :
-	<cflags>"`pkg-config --cflags libexslt`"
-	<linkflags>"`pkg-config --libs libexslt`" ;
-
-lib dl : : <name>dl ;
-lib fcgi : : <name>fcgi ;
-lib fcgi++ : : <name>fcgi++ ;
-lib boost_system : : <name>boost_system ;
-lib boost_filesystem : : <name>boost_filesystem ;
-lib boost_date_time : : <name>boost_date_time ;
-lib boost_program_options : : <name>boost_program_options ;
-lib cgicc : : <name>cgicc ;
-lib esmtp : : <name>esmtp ;
-lib curl : : <name>curl ;
-lib osspuuid : : <name>ossp-uuid++ ;
-
-alias p2parts : : : :
-	<library>p2url
-	<library>p2files
-	<library>p2processes
-	<library>p2sql
-	<library>p2mail
-	<library>p2regex
-	<library>p2xml
-	;
-
 feature uuid : boost ossp : propagated ;
 feature odbc : yes no : propagated ;
 feature pq : yes no : propagated ;
 
+alias p2parts : : : :
+	<library>url//p2url
+	<library>files//p2files
+	<library>processes//p2processes
+	<library>sql//p2sql
+	<library>mail//p2mail
+	<library>regex//p2regex
+	<library>xml//p2xml
+	;
+
 project
   : requirements
       <variant>debug:<cflags>"-W -Wall -Werror -Wwrite-strings"
       <variant>debug:<linkflags>"-Wl,-z,defs --warn-once"
 	;
 
-lib p2uuid :
-	uuid.cpp
-	:
-	<uuid>ossp:<define>OSSP_UUID
-	<uuid>boost:<define>BOOST_UUID
-	<uuid>ossp:<library>osspuuid
-	;
-
-lib p2common :
-	appEngine.cpp dataSource.cpp environment.cpp fileStarGlibIoChannel.cpp iHaveParameters.cpp library.cpp iHaveSubTasks.cpp
-	iterate.cpp paramChecker.cpp presenter.cpp logger.cpp if.cpp xmlScriptParser.cpp viewHost.cpp
-	sourceObject.cpp task.cpp variables.cpp variableConvert.cpp view.cpp xmlObjectLoader.cpp exceptions.cpp cache.cpp
-	sessionContainer.cpp sessionClearTask.cpp session.cpp sessionSetTask.cpp commonObjects.cpp taskHost.cpp checkHost.cpp
-	rowView.cpp rowSet.cpp rowProcessor.cpp config.cpp fileStrmVarWriter.cpp noOutputExecute.cpp columns.cpp scopeObject.cpp
-	transform.cpp definedColumns.cpp structExceptHandling.cpp validDateCheck.cpp
-	variables-modconfig.cpp
-	variables-modlocalparam.cpp
-	variables-modlookup.cpp
-	variables-modparam.cpp
-	variables-modsession.cpp
-	variables-moduri.cpp
-	../libmisc/buffer.cpp
-	../libmisc/misc.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>dl
-	<library>boost_system
-	<library>boost_filesystem
-	<library>boost_date_time
-	<library>boost_program_options
-	: :
-	<include>.
-	<include>../libmisc
-	<library>boost_system
-	<library>boost_program_options
-	;
-
-lib p2xml :
-	rawView.cpp xmlPresenter.cpp transformHtml.cpp transformText.cpp xmlRows.cpp
-	xmlRawRows.cpp xslRows.cpp xslRowsCache.cpp xslPreFetch.cpp xmlMemCache.cpp xmlCache.cpp sessionXml.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>p2common
-	<library>p2uuid
-	<library>p2url
-	<library>libxslt
-	<library>boost_filesystem
-	: :
-	<library>p2uuid
-	;
-
-lib p2processes :
-	procRows.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>p2common
-	<library>p2files
-	;
-
-lib p2files :
-	fsRows.cpp
-	fileRows.cpp
-	streamRows.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>boost_filesystem
-	<library>boost_system
-	<library>p2common
-	;
-
-lib p2regex :
-	regexCheck.cpp regexRows.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>p2common
-	;
-
-explicit object sql-modODBC ;
-obj sql-modODBC :
-	sql-modODBC.cpp :
-	<library>../libodbcpp//odbcpp
-	<library>libxmlpp
-	<include>../libmisc
-	: :
-	<library>../libodbcpp//odbcpp
-	;
-	
-explicit object sql-modPQ ;
-obj sql-modPQ :
-	sql-modPQ.cpp :
-	<library>../libpqpp//pqpp
-	<library>libxmlpp
-	<include>../libmisc
-	: :
-	<library>../libpqpp//pqpp
-	;
-	
-lib p2sql :
-	sqlCheck.cpp sqlWriter.cpp sqlTask.cpp sqlMergeTask.cpp sqlRows.cpp sqlCache.cpp sqlVariableBinder.cpp tablepatch.cpp rdbmsDataSource.cpp
-	sqlHandleAsVariableType.cpp
-	../libdbpp//dbpp
-	:
-	<odbc>yes:<library>sql-modODBC
-	<pq>yes:<library>sql-modPQ
-	<library>libxmlpp
-	<library>p2common
-	<include>../libmisc
-	;
-
-lib p2url :
-	urlRows.cpp
-	curlHelper.cpp
-	../libmisc/curlsup.cpp
-	:
-	<library>p2common
-	<library>p2files
-	<include>../libmisc
-	<library>libxmlpp
-	<library>curl
-	: :
-	<library>curl
-	;
-
-lib p2mail :
-	sendmailTask.cpp
-	:
-	<include>../libmisc
-	<library>libxmlpp
-	<library>libxslt
-	<library>esmtp
-	<library>p2common
-	<library>p2xml
-	;
-
-lib p2web :
-	[ glob cgi/cgi*.cpp ]
-	:
-	<include>../libmisc
-	<library>cgicc
-	<library>glibmm
-	<library>libxmlpp
-	<library>p2common
-	<library>p2uuid
-	<library>boost_program_options
-	<library>boost_filesystem
-	<library>p2xml
-	: :
-	<library>p2parts
-	<library>cgicc
-	<library>p2common
-	;
-
-exe p2cgi :
-	cgi/p2webCgi.cpp
-	:
-	<library>p2web
-	<include>../libmisc
-	;
-
-exe p2fcgi :
-	cgi/p2webFCgi.cpp cgi/FCgiIO.cpp
-	fcgi++
-	fcgi
-	:
-	<library>p2web
-	<include>../libmisc
-	;
-
-exe testCgi :
-	cgi/testCgi.cpp
-	:
-	<library>p2web
-	<include>../libmisc
-	;
-
-exe p2console :
-	[ glob console/*.cpp ]
-	:
-	<library>p2parts
-	<library>p2common
-	<include>../libmisc
-	;
+build-project console ;
+build-project cgi ;
 
 explicit install installp2con installp2cgi installp2fcgi ;
-package.install install : : p2console p2cgi p2fcgi ;
-package.install installp2con : : p2console ;
-package.install installp2cgi : : p2cgi ;
-package.install installp2fcgi : : p2fcgi ;
+package.install install : : console//p2console cgi//p2cgi cgi//p2fcgi ;
+package.install installp2con : : console//p2console ;
+package.install installp2cgi : : cgi//p2cgi ;
+package.install installp2fcgi : : cgi//p2fcgi ;
 
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;
diff --git a/project2/common/Jamfile.jam b/project2/common/Jamfile.jam
new file mode 100644
index 0000000..2d88168
--- /dev/null
+++ b/project2/common/Jamfile.jam
@@ -0,0 +1,40 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+lib dl : : <name>dl ;
+lib boost_system : : <name>boost_system ;
+lib boost_filesystem : : <name>boost_filesystem ;
+lib boost_date_time : : <name>boost_date_time ;
+lib boost_program_options : : <name>boost_program_options ;
+
+lib p2common :
+	appEngine.cpp dataSource.cpp environment.cpp fileStarGlibIoChannel.cpp iHaveParameters.cpp library.cpp iHaveSubTasks.cpp
+	iterate.cpp paramChecker.cpp presenter.cpp logger.cpp if.cpp xmlScriptParser.cpp viewHost.cpp
+	sourceObject.cpp task.cpp variables.cpp variableConvert.cpp view.cpp xmlObjectLoader.cpp exceptions.cpp cache.cpp
+	sessionContainer.cpp sessionClearTask.cpp session.cpp sessionSetTask.cpp commonObjects.cpp taskHost.cpp checkHost.cpp
+	rowView.cpp rowSet.cpp rowProcessor.cpp config.cpp fileStrmVarWriter.cpp noOutputExecute.cpp columns.cpp scopeObject.cpp
+	transform.cpp definedColumns.cpp structExceptHandling.cpp validDateCheck.cpp
+	variables-modconfig.cpp
+	variables-modlocalparam.cpp
+	variables-modlookup.cpp
+	variables-modparam.cpp
+	variables-modsession.cpp
+	variables-moduri.cpp
+	../../libmisc/buffer.cpp
+	../../libmisc/misc.cpp
+	:
+	<include>../../libmisc
+	<library>libxmlpp
+	<library>dl
+	<library>boost_system
+	<library>boost_filesystem
+	<library>boost_date_time
+	<library>boost_program_options
+	<library>../uuid//p2uuid
+	: :
+	<include>.
+	<include>../../libmisc
+	<library>boost_system
+	<library>boost_program_options
+	;
+
diff --git a/project2/appEngine.cpp b/project2/common/appEngine.cpp
index d8c097b..d8c097b 100644
--- a/project2/appEngine.cpp
+++ b/project2/common/appEngine.cpp
diff --git a/project2/appEngine.h b/project2/common/appEngine.h
index 689f1b5..689f1b5 100644
--- a/project2/appEngine.h
+++ b/project2/common/appEngine.h
diff --git a/project2/cache.cpp b/project2/common/cache.cpp
index 1dc435f..1dc435f 100644
--- a/project2/cache.cpp
+++ b/project2/common/cache.cpp
diff --git a/project2/cache.h b/project2/common/cache.h
index 899a01e..899a01e 100644
--- a/project2/cache.h
+++ b/project2/common/cache.h
diff --git a/project2/checkHost.cpp b/project2/common/checkHost.cpp
index a39c176..a39c176 100644
--- a/project2/checkHost.cpp
+++ b/project2/common/checkHost.cpp
diff --git a/project2/checkHost.h b/project2/common/checkHost.h
index 54fc96d..54fc96d 100644
--- a/project2/checkHost.h
+++ b/project2/common/checkHost.h
diff --git a/project2/columns.cpp b/project2/common/columns.cpp
index a2511f6..a2511f6 100644
--- a/project2/columns.cpp
+++ b/project2/common/columns.cpp
diff --git a/project2/columns.h b/project2/common/columns.h
index 8b9b9b3..8b9b9b3 100644
--- a/project2/columns.h
+++ b/project2/common/columns.h
diff --git a/project2/commonObjects.cpp b/project2/common/commonObjects.cpp
index e811fe7..e811fe7 100644
--- a/project2/commonObjects.cpp
+++ b/project2/common/commonObjects.cpp
diff --git a/project2/commonObjects.h b/project2/common/commonObjects.h
index dae563a..dae563a 100644
--- a/project2/commonObjects.h
+++ b/project2/common/commonObjects.h
diff --git a/project2/config.cpp b/project2/common/config.cpp
index a3b9afe..a3b9afe 100644
--- a/project2/config.cpp
+++ b/project2/common/config.cpp
diff --git a/project2/config.h b/project2/common/config.h
index 9f6cd5d..9f6cd5d 100644
--- a/project2/config.h
+++ b/project2/common/config.h
diff --git a/project2/dataSource.cpp b/project2/common/dataSource.cpp
index e40ad64..e40ad64 100644
--- a/project2/dataSource.cpp
+++ b/project2/common/dataSource.cpp
diff --git a/project2/dataSource.h b/project2/common/dataSource.h
index d8a5a9a..d8a5a9a 100644
--- a/project2/dataSource.h
+++ b/project2/common/dataSource.h
diff --git a/project2/definedColumns.cpp b/project2/common/definedColumns.cpp
index 5260e51..5260e51 100644
--- a/project2/definedColumns.cpp
+++ b/project2/common/definedColumns.cpp
diff --git a/project2/definedColumns.h b/project2/common/definedColumns.h
index 2fc6bbd..2fc6bbd 100644
--- a/project2/definedColumns.h
+++ b/project2/common/definedColumns.h
diff --git a/project2/environment.cpp b/project2/common/environment.cpp
index 0c563cc..0c563cc 100644
--- a/project2/environment.cpp
+++ b/project2/common/environment.cpp
diff --git a/project2/environment.h b/project2/common/environment.h
index 681a80c..681a80c 100644
--- a/project2/environment.h
+++ b/project2/common/environment.h
diff --git a/project2/exceptions.cpp b/project2/common/exceptions.cpp
index ddf8e94..ddf8e94 100644
--- a/project2/exceptions.cpp
+++ b/project2/common/exceptions.cpp
diff --git a/project2/exceptions.h b/project2/common/exceptions.h
index a9d4952..a9d4952 100644
--- a/project2/exceptions.h
+++ b/project2/common/exceptions.h
diff --git a/project2/fileStarGlibIoChannel.cpp b/project2/common/fileStarGlibIoChannel.cpp
index 3ec26ce..3ec26ce 100644
--- a/project2/fileStarGlibIoChannel.cpp
+++ b/project2/common/fileStarGlibIoChannel.cpp
diff --git a/project2/fileStarGlibIoChannel.h b/project2/common/fileStarGlibIoChannel.h
index 77b6282..77b6282 100644
--- a/project2/fileStarGlibIoChannel.h
+++ b/project2/common/fileStarGlibIoChannel.h
diff --git a/project2/fileStrmVarWriter.cpp b/project2/common/fileStrmVarWriter.cpp
index 51fb487..51fb487 100644
--- a/project2/fileStrmVarWriter.cpp
+++ b/project2/common/fileStrmVarWriter.cpp
diff --git a/project2/fileStrmVarWriter.h b/project2/common/fileStrmVarWriter.h
index b98691b..b98691b 100644
--- a/project2/fileStrmVarWriter.h
+++ b/project2/common/fileStrmVarWriter.h
diff --git a/project2/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp
index e4f456a..e4f456a 100644
--- a/project2/iHaveParameters.cpp
+++ b/project2/common/iHaveParameters.cpp
diff --git a/project2/iHaveParameters.h b/project2/common/iHaveParameters.h
index 28dbf7d..28dbf7d 100644
--- a/project2/iHaveParameters.h
+++ b/project2/common/iHaveParameters.h
diff --git a/project2/iHaveSubTasks.cpp b/project2/common/iHaveSubTasks.cpp
index f78f81e..f78f81e 100644
--- a/project2/iHaveSubTasks.cpp
+++ b/project2/common/iHaveSubTasks.cpp
diff --git a/project2/iHaveSubTasks.h b/project2/common/iHaveSubTasks.h
index ee6d173..ee6d173 100644
--- a/project2/iHaveSubTasks.h
+++ b/project2/common/iHaveSubTasks.h
diff --git a/project2/if.cpp b/project2/common/if.cpp
index cf5c156..cf5c156 100644
--- a/project2/if.cpp
+++ b/project2/common/if.cpp
diff --git a/project2/if.h b/project2/common/if.h
index b33bca1..b33bca1 100644
--- a/project2/if.h
+++ b/project2/common/if.h
diff --git a/project2/iterate.cpp b/project2/common/iterate.cpp
index 119e839..119e839 100644
--- a/project2/iterate.cpp
+++ b/project2/common/iterate.cpp
diff --git a/project2/iterate.h b/project2/common/iterate.h
index 50fd879..50fd879 100644
--- a/project2/iterate.h
+++ b/project2/common/iterate.h
diff --git a/project2/library.cpp b/project2/common/library.cpp
index b1e0b9b..b1e0b9b 100644
--- a/project2/library.cpp
+++ b/project2/common/library.cpp
diff --git a/project2/library.h b/project2/common/library.h
index af8e73f..af8e73f 100644
--- a/project2/library.h
+++ b/project2/common/library.h
diff --git a/project2/logger.cpp b/project2/common/logger.cpp
index 6133ce9..6133ce9 100644
--- a/project2/logger.cpp
+++ b/project2/common/logger.cpp
diff --git a/project2/logger.h b/project2/common/logger.h
index 5d42631..5d42631 100644
--- a/project2/logger.h
+++ b/project2/common/logger.h
diff --git a/project2/loggers.h b/project2/common/loggers.h
index 69b352c..69b352c 100644
--- a/project2/loggers.h
+++ b/project2/common/loggers.h
diff --git a/project2/noOutputExecute.cpp b/project2/common/noOutputExecute.cpp
index 3bfa0e9..3bfa0e9 100644
--- a/project2/noOutputExecute.cpp
+++ b/project2/common/noOutputExecute.cpp
diff --git a/project2/noOutputExecute.h b/project2/common/noOutputExecute.h
index 1047f38..1047f38 100644
--- a/project2/noOutputExecute.h
+++ b/project2/common/noOutputExecute.h
diff --git a/project2/ostreamWrapper.h b/project2/common/ostreamWrapper.h
index ef8596c..ef8596c 100644
--- a/project2/ostreamWrapper.h
+++ b/project2/common/ostreamWrapper.h
diff --git a/project2/paramChecker.cpp b/project2/common/paramChecker.cpp
index 0781e90..0781e90 100644
--- a/project2/paramChecker.cpp
+++ b/project2/common/paramChecker.cpp
diff --git a/project2/paramChecker.h b/project2/common/paramChecker.h
index d013fc4..d013fc4 100644
--- a/project2/paramChecker.h
+++ b/project2/common/paramChecker.h
diff --git a/project2/presenter.cpp b/project2/common/presenter.cpp
index 9544743..9544743 100644
--- a/project2/presenter.cpp
+++ b/project2/common/presenter.cpp
diff --git a/project2/presenter.h b/project2/common/presenter.h
index a4c0a00..a4c0a00 100644
--- a/project2/presenter.h
+++ b/project2/common/presenter.h
diff --git a/project2/rowProcessor.cpp b/project2/common/rowProcessor.cpp
index 4ea89fd..4ea89fd 100644
--- a/project2/rowProcessor.cpp
+++ b/project2/common/rowProcessor.cpp
diff --git a/project2/rowProcessor.h b/project2/common/rowProcessor.h
index c25dc73..c25dc73 100644
--- a/project2/rowProcessor.h
+++ b/project2/common/rowProcessor.h
diff --git a/project2/rowSet.cpp b/project2/common/rowSet.cpp
index 6902fd3..6902fd3 100644
--- a/project2/rowSet.cpp
+++ b/project2/common/rowSet.cpp
diff --git a/project2/rowSet.h b/project2/common/rowSet.h
index a181059..a181059 100644
--- a/project2/rowSet.h
+++ b/project2/common/rowSet.h
diff --git a/project2/rowView.cpp b/project2/common/rowView.cpp
index 092192f..092192f 100644
--- a/project2/rowView.cpp
+++ b/project2/common/rowView.cpp
diff --git a/project2/rowView.h b/project2/common/rowView.h
index c065414..c065414 100644
--- a/project2/rowView.h
+++ b/project2/common/rowView.h
diff --git a/project2/safeMapFind.h b/project2/common/safeMapFind.h
index b27caf3..b27caf3 100644
--- a/project2/safeMapFind.h
+++ b/project2/common/safeMapFind.h
diff --git a/project2/scopeObject.cpp b/project2/common/scopeObject.cpp
index 268fd2c..268fd2c 100644
--- a/project2/scopeObject.cpp
+++ b/project2/common/scopeObject.cpp
diff --git a/project2/scopeObject.h b/project2/common/scopeObject.h
index d019e7d..d019e7d 100644
--- a/project2/scopeObject.h
+++ b/project2/common/scopeObject.h
diff --git a/project2/session.cpp b/project2/common/session.cpp
index 6246068..6246068 100644
--- a/project2/session.cpp
+++ b/project2/common/session.cpp
diff --git a/project2/session.h b/project2/common/session.h
index 7b66db9..7b66db9 100644
--- a/project2/session.h
+++ b/project2/common/session.h
diff --git a/project2/sessionClearTask.cpp b/project2/common/sessionClearTask.cpp
index 15ba270..15ba270 100644
--- a/project2/sessionClearTask.cpp
+++ b/project2/common/sessionClearTask.cpp
diff --git a/project2/sessionClearTask.h b/project2/common/sessionClearTask.h
index 8241f8a..8241f8a 100644
--- a/project2/sessionClearTask.h
+++ b/project2/common/sessionClearTask.h
diff --git a/project2/sessionContainer.cpp b/project2/common/sessionContainer.cpp
index 635889b..635889b 100644
--- a/project2/sessionContainer.cpp
+++ b/project2/common/sessionContainer.cpp
diff --git a/project2/sessionContainer.h b/project2/common/sessionContainer.h
index fcad4b9..fcad4b9 100644
--- a/project2/sessionContainer.h
+++ b/project2/common/sessionContainer.h
diff --git a/project2/sessionSetTask.cpp b/project2/common/sessionSetTask.cpp
index 4ae344f..4ae344f 100644
--- a/project2/sessionSetTask.cpp
+++ b/project2/common/sessionSetTask.cpp
diff --git a/project2/sessionSetTask.h b/project2/common/sessionSetTask.h
index f439768..f439768 100644
--- a/project2/sessionSetTask.h
+++ b/project2/common/sessionSetTask.h
diff --git a/project2/sourceObject.cpp b/project2/common/sourceObject.cpp
index a5736ba..a5736ba 100644
--- a/project2/sourceObject.cpp
+++ b/project2/common/sourceObject.cpp
diff --git a/project2/sourceObject.h b/project2/common/sourceObject.h
index 3ebae2c..3ebae2c 100644
--- a/project2/sourceObject.h
+++ b/project2/common/sourceObject.h
diff --git a/project2/structExceptHandling.cpp b/project2/common/structExceptHandling.cpp
index f87b870..f87b870 100644
--- a/project2/structExceptHandling.cpp
+++ b/project2/common/structExceptHandling.cpp
diff --git a/project2/structExceptHandling.h b/project2/common/structExceptHandling.h
index eabd384..eabd384 100644
--- a/project2/structExceptHandling.h
+++ b/project2/common/structExceptHandling.h
diff --git a/project2/task.cpp b/project2/common/task.cpp
index 5f828ef..5f828ef 100644
--- a/project2/task.cpp
+++ b/project2/common/task.cpp
diff --git a/project2/task.h b/project2/common/task.h
index 57697e2..57697e2 100644
--- a/project2/task.h
+++ b/project2/common/task.h
diff --git a/project2/taskHost.cpp b/project2/common/taskHost.cpp
index 63ab301..63ab301 100644
--- a/project2/taskHost.cpp
+++ b/project2/common/taskHost.cpp
diff --git a/project2/taskHost.h b/project2/common/taskHost.h
index ca8275c..ca8275c 100644
--- a/project2/taskHost.h
+++ b/project2/common/taskHost.h
diff --git a/project2/transform.cpp b/project2/common/transform.cpp
index 37524a0..37524a0 100644
--- a/project2/transform.cpp
+++ b/project2/common/transform.cpp
diff --git a/project2/transform.h b/project2/common/transform.h
index ded356b..ded356b 100644
--- a/project2/transform.h
+++ b/project2/common/transform.h
diff --git a/project2/validDateCheck.cpp b/project2/common/validDateCheck.cpp
index 410a003..410a003 100644
--- a/project2/validDateCheck.cpp
+++ b/project2/common/validDateCheck.cpp
diff --git a/project2/variableConvert.cpp b/project2/common/variableConvert.cpp
index b144175..b144175 100644
--- a/project2/variableConvert.cpp
+++ b/project2/common/variableConvert.cpp
diff --git a/project2/variables-modconfig.cpp b/project2/common/variables-modconfig.cpp
index 88fddd4..88fddd4 100644
--- a/project2/variables-modconfig.cpp
+++ b/project2/common/variables-modconfig.cpp
diff --git a/project2/variables-modlocalparam.cpp b/project2/common/variables-modlocalparam.cpp
index 24e1d54..24e1d54 100644
--- a/project2/variables-modlocalparam.cpp
+++ b/project2/common/variables-modlocalparam.cpp
diff --git a/project2/variables-modlookup.cpp b/project2/common/variables-modlookup.cpp
index 85a1fbe..85a1fbe 100644
--- a/project2/variables-modlookup.cpp
+++ b/project2/common/variables-modlookup.cpp
diff --git a/project2/variables-modparam.cpp b/project2/common/variables-modparam.cpp
index 0b205db..0b205db 100644
--- a/project2/variables-modparam.cpp
+++ b/project2/common/variables-modparam.cpp
diff --git a/project2/variables-modsession.cpp b/project2/common/variables-modsession.cpp
index 963a105..963a105 100644
--- a/project2/variables-modsession.cpp
+++ b/project2/common/variables-modsession.cpp
diff --git a/project2/variables-moduri.cpp b/project2/common/variables-moduri.cpp
index 00fb7bf..00fb7bf 100644
--- a/project2/variables-moduri.cpp
+++ b/project2/common/variables-moduri.cpp
diff --git a/project2/variables.cpp b/project2/common/variables.cpp
index 9108889..9108889 100644
--- a/project2/variables.cpp
+++ b/project2/common/variables.cpp
diff --git a/project2/variables.h b/project2/common/variables.h
index 6dbbf2b..6dbbf2b 100644
--- a/project2/variables.h
+++ b/project2/common/variables.h
diff --git a/project2/view.cpp b/project2/common/view.cpp
index ad9ef1f..ad9ef1f 100644
--- a/project2/view.cpp
+++ b/project2/common/view.cpp
diff --git a/project2/view.h b/project2/common/view.h
index 80d7b30..80d7b30 100644
--- a/project2/view.h
+++ b/project2/common/view.h
diff --git a/project2/viewHost.cpp b/project2/common/viewHost.cpp
index c240f76..3c7f8c6 100644
--- a/project2/viewHost.cpp
+++ b/project2/common/viewHost.cpp
@@ -1,5 +1,5 @@
 #include "viewHost.h"
-#include "xmlPresenter.h"
+#include "transform.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
diff --git a/project2/viewHost.h b/project2/common/viewHost.h
index 5995d82..5995d82 100644
--- a/project2/viewHost.h
+++ b/project2/common/viewHost.h
diff --git a/project2/xmlObjectLoader.cpp b/project2/common/xmlObjectLoader.cpp
index 14d2972..14d2972 100644
--- a/project2/xmlObjectLoader.cpp
+++ b/project2/common/xmlObjectLoader.cpp
diff --git a/project2/xmlObjectLoader.h b/project2/common/xmlObjectLoader.h
index 4795717..4795717 100644
--- a/project2/xmlObjectLoader.h
+++ b/project2/common/xmlObjectLoader.h
diff --git a/project2/xmlScriptParser.cpp b/project2/common/xmlScriptParser.cpp
index 9b76316..9b76316 100644
--- a/project2/xmlScriptParser.cpp
+++ b/project2/common/xmlScriptParser.cpp
diff --git a/project2/xmlScriptParser.h b/project2/common/xmlScriptParser.h
index 9f1406d..9f1406d 100644
--- a/project2/xmlScriptParser.h
+++ b/project2/common/xmlScriptParser.h
diff --git a/project2/xmlStorage.h b/project2/common/xmlStorage.h
index 73fce0a..73fce0a 100644
--- a/project2/xmlStorage.h
+++ b/project2/common/xmlStorage.h
diff --git a/project2/console/Jamfile.jam b/project2/console/Jamfile.jam
new file mode 100644
index 0000000..72d2c1f
--- /dev/null
+++ b/project2/console/Jamfile.jam
@@ -0,0 +1,12 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+
+exe p2console :
+	[ glob *.cpp ]
+	:
+	<library>..//p2parts
+	<library>../common//p2common
+	<include>../../libmisc
+	;
+
diff --git a/project2/console/consoleAppEngine.cpp b/project2/console/consoleAppEngine.cpp
index 32789be..ce1cd0a 100644
--- a/project2/console/consoleAppEngine.cpp
+++ b/project2/console/consoleAppEngine.cpp
@@ -1,7 +1,7 @@
 #include "consoleAppEngine.h"
 #include "consoleEnvironment.h"
-#include "../iterate.h"
-#include "../xmlObjectLoader.h"
+#include "iterate.h"
+#include "xmlObjectLoader.h"
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/project2/console/consoleAppEngine.h b/project2/console/consoleAppEngine.h
index 5e0a403..f547a99 100644
--- a/project2/console/consoleAppEngine.h
+++ b/project2/console/consoleAppEngine.h
@@ -1,14 +1,14 @@
 #ifndef CONSOLEAPPENGINE_H
 #define CONSOLEAPPENGINE_H
 
-#include "../appEngine.h"
-#include "../task.h"
-#include "../paramChecker.h"
-#include "../presenter.h"
-#include "../commonObjects.h"
-#include "../view.h"
-#include "../taskHost.h"
-#include "../viewHost.h"
+#include "appEngine.h"
+#include "task.h"
+#include "paramChecker.h"
+#include "presenter.h"
+#include "commonObjects.h"
+#include "view.h"
+#include "taskHost.h"
+#include "viewHost.h"
 #include <boost/intrusive_ptr.hpp>
 #include <libxml++/document.h>
 
diff --git a/project2/console/consoleEnvironment.cpp b/project2/console/consoleEnvironment.cpp
index 6d1471b..128ecac 100644
--- a/project2/console/consoleEnvironment.cpp
+++ b/project2/console/consoleEnvironment.cpp
@@ -3,9 +3,9 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "../logger.h"
-#include "../exceptions.h"
-#include "../xmlObjectLoader.h"
+#include "logger.h"
+#include "exceptions.h"
+#include "xmlObjectLoader.h"
 #include <iostream>
 #include <string>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/project2/console/consoleEnvironment.h b/project2/console/consoleEnvironment.h
index c72eed5..363090d 100644
--- a/project2/console/consoleEnvironment.h
+++ b/project2/console/consoleEnvironment.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <boost/filesystem/path.hpp>
-#include "../environment.h"
+#include "environment.h"
 
 class ConsoleEnvironment : public Environment {
 	public:
diff --git a/project2/console/consolePresenter.h b/project2/console/consolePresenter.h
index 98cce6d..dc409ab 100644
--- a/project2/console/consolePresenter.h
+++ b/project2/console/consolePresenter.h
@@ -1,8 +1,8 @@
 #ifndef CONSOLEPRESENTER_H
 #define CONSOLEPRESENTER_H
 
-#include "../presenter.h"
-#include "../fileStrmVarWriter.h"
+#include "presenter.h"
+#include "fileStrmVarWriter.h"
 
 class ConsolePresenter : public Presenter {
 	public:
diff --git a/project2/console/p2consoleMain.cpp b/project2/console/p2consoleMain.cpp
index 40995d2..bad803f 100644
--- a/project2/console/p2consoleMain.cpp
+++ b/project2/console/p2consoleMain.cpp
@@ -1,8 +1,8 @@
 #include <libxml/tree.h>
 #include "consoleEnvironment.h"
 #include "consoleAppEngine.h"
-#include "../xmlObjectLoader.h"
-#include "../logger.h"
+#include "xmlObjectLoader.h"
+#include "logger.h"
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
diff --git a/project2/files/Jamfile.jam b/project2/files/Jamfile.jam
new file mode 100644
index 0000000..ec1e19e
--- /dev/null
+++ b/project2/files/Jamfile.jam
@@ -0,0 +1,20 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+lib boost_system : : <name>boost_system ;
+lib boost_filesystem : : <name>boost_filesystem ;
+
+lib p2files :
+	fsRows.cpp
+	fileRows.cpp
+	streamRows.cpp
+	:
+	<include>../libmisc
+	<library>libxmlpp
+	<library>boost_filesystem
+	<library>boost_system
+	<library>../common//p2common
+	: :
+	<include>.
+	;
+
diff --git a/project2/fileRows.cpp b/project2/files/fileRows.cpp
index d7c8fca..d7c8fca 100644
--- a/project2/fileRows.cpp
+++ b/project2/files/fileRows.cpp
diff --git a/project2/fileRows.h b/project2/files/fileRows.h
index 0cf3f1d..0cf3f1d 100644
--- a/project2/fileRows.h
+++ b/project2/files/fileRows.h
diff --git a/project2/fsRows.cpp b/project2/files/fsRows.cpp
index cb73b04..cb73b04 100644
--- a/project2/fsRows.cpp
+++ b/project2/files/fsRows.cpp
diff --git a/project2/fsRows.h b/project2/files/fsRows.h
index 3356b37..3356b37 100644
--- a/project2/fsRows.h
+++ b/project2/files/fsRows.h
diff --git a/project2/streamRows.cpp b/project2/files/streamRows.cpp
index 0be76cd..0be76cd 100644
--- a/project2/streamRows.cpp
+++ b/project2/files/streamRows.cpp
diff --git a/project2/streamRows.h b/project2/files/streamRows.h
index 2d10116..2d10116 100644
--- a/project2/streamRows.h
+++ b/project2/files/streamRows.h
diff --git a/project2/mail/Jamfile.jam b/project2/mail/Jamfile.jam
new file mode 100644
index 0000000..8c8f189
--- /dev/null
+++ b/project2/mail/Jamfile.jam
@@ -0,0 +1,15 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+lib esmtp : : <name>esmtp ;
+
+lib p2mail :
+	sendmailTask.cpp
+	:
+	<include>../../libmisc
+	<library>libxmlpp
+	<library>esmtp
+	<library>../common//p2common
+	<library>../xml//p2xml
+	;
+
diff --git a/project2/sendmailTask.cpp b/project2/mail/sendmailTask.cpp
index 73afb20..73afb20 100644
--- a/project2/sendmailTask.cpp
+++ b/project2/mail/sendmailTask.cpp
diff --git a/project2/sendmailTask.h b/project2/mail/sendmailTask.h
index fa8427f..fa8427f 100644
--- a/project2/sendmailTask.h
+++ b/project2/mail/sendmailTask.h
diff --git a/project2/processes/Jamfile.jam b/project2/processes/Jamfile.jam
new file mode 100644
index 0000000..4c0c2b4
--- /dev/null
+++ b/project2/processes/Jamfile.jam
@@ -0,0 +1,13 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+
+lib p2processes :
+	procRows.cpp
+	:
+	<include>../../libmisc
+	<library>libxmlpp
+	<library>../common//p2common
+	<library>../files//p2files
+	;
+
diff --git a/project2/procRows.cpp b/project2/processes/procRows.cpp
index f1d00e0..f1d00e0 100644
--- a/project2/procRows.cpp
+++ b/project2/processes/procRows.cpp
diff --git a/project2/procRows.h b/project2/processes/procRows.h
index 63dbb8e..63dbb8e 100644
--- a/project2/procRows.h
+++ b/project2/processes/procRows.h
diff --git a/project2/regex/Jamfile.jam b/project2/regex/Jamfile.jam
new file mode 100644
index 0000000..a83697f
--- /dev/null
+++ b/project2/regex/Jamfile.jam
@@ -0,0 +1,12 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+
+lib p2regex :
+	regexCheck.cpp regexRows.cpp
+	:
+	<include>../../libmisc
+	<library>libxmlpp
+	<library>../common//p2common
+	;
+
diff --git a/project2/regexCheck.cpp b/project2/regex/regexCheck.cpp
index b88a44c..b88a44c 100644
--- a/project2/regexCheck.cpp
+++ b/project2/regex/regexCheck.cpp
diff --git a/project2/regexCheck.h b/project2/regex/regexCheck.h
index 17033de..17033de 100644
--- a/project2/regexCheck.h
+++ b/project2/regex/regexCheck.h
diff --git a/project2/regexRows.cpp b/project2/regex/regexRows.cpp
index 1dab636..1dab636 100644
--- a/project2/regexRows.cpp
+++ b/project2/regex/regexRows.cpp
diff --git a/project2/regexRows.h b/project2/regex/regexRows.h
index cef2e71..cef2e71 100644
--- a/project2/regexRows.h
+++ b/project2/regex/regexRows.h
diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
new file mode 100644
index 0000000..b05fd34
--- /dev/null
+++ b/project2/sql/Jamfile.jam
@@ -0,0 +1,38 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+
+explicit object sql-modODBC ;
+obj sql-modODBC :
+	sql-modODBC.cpp :
+	<library>../../libodbcpp//odbcpp
+	<library>libxmlpp
+	<include>../../libmisc
+	<include>../common
+	: :
+	<library>../../libodbcpp//odbcpp
+	;
+	
+explicit object sql-modPQ ;
+obj sql-modPQ :
+	sql-modPQ.cpp :
+	<library>../../libpqpp//pqpp
+	<library>libxmlpp
+	<include>../../libmisc
+	<include>../common
+	: :
+	<library>../../libpqpp//pqpp
+	;
+	
+lib p2sql :
+	sqlCheck.cpp sqlWriter.cpp sqlTask.cpp sqlMergeTask.cpp sqlRows.cpp sqlCache.cpp sqlVariableBinder.cpp tablepatch.cpp rdbmsDataSource.cpp
+	sqlHandleAsVariableType.cpp
+	../../libdbpp//dbpp
+	:
+	<odbc>yes:<library>sql-modODBC
+	<pq>yes:<library>sql-modPQ
+	<library>libxmlpp
+	<library>../common//p2common
+	<include>../../libmisc
+	;
+
diff --git a/project2/sql/connectionLoader.h b/project2/sql/connectionLoader.h
new file mode 100644
index 0000000..841b425
--- /dev/null
+++ b/project2/sql/connectionLoader.h
@@ -0,0 +1,19 @@
+#include "xmlObjectLoader.h"
+#include "../libdbpp/connection.h"
+
+/// Base class to implement DB connection type modules
+class ConnectionLoader : public ComponentLoader {
+	public:
+		virtual DB::Connection * connect(const std::string & dsn) const = 0;
+};
+
+/// Helper implemention for specific DB types
+template <class DBType>
+class ConnectionLoaderImpl : public ConnectionLoader {
+	public:
+		virtual DB::Connection * connect(const std::string & dsn) const
+		{
+			return new DBType(dsn);
+		}
+};
+
diff --git a/project2/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp
index 97ff64f..dac6cb1 100644
--- a/project2/rdbmsDataSource.cpp
+++ b/project2/sql/rdbmsDataSource.cpp
@@ -1,4 +1,5 @@
 #include "rdbmsDataSource.h"
+#include "connectionLoader.h"
 #include <libxml++/nodes/textnode.h>
 #include <sys/utsname.h>
 #include "logger.h"
diff --git a/project2/rdbmsDataSource.h b/project2/sql/rdbmsDataSource.h
index 0e175e7..fdcfbe7 100644
--- a/project2/rdbmsDataSource.h
+++ b/project2/sql/rdbmsDataSource.h
@@ -10,21 +10,7 @@
 #include "../libdbpp/error.h"
 #include "xmlObjectLoader.h"
 
-/// Base class to implement DB connection type modules
-class ConnectionLoader : public ComponentLoader {
-	public:
-		virtual DB::Connection * connect(const std::string & dsn) const = 0;
-};
-
-/// Helper implemention for specific DB types
-template <class DBType>
-class ConnectionLoaderImpl : public ConnectionLoader {
-	public:
-		virtual DB::Connection * connect(const std::string & dsn) const
-		{
-			return new DBType(dsn);
-		}
-};
+class ConnectionLoader;
 
 /// Project2 component to provide access to transactional RDBMS data sources
 class RdbmsDataSource : public DataSource {
diff --git a/project2/sql-modODBC.cpp b/project2/sql/sql-modODBC.cpp
index ca57731..1703cb6 100644
--- a/project2/sql-modODBC.cpp
+++ b/project2/sql/sql-modODBC.cpp
@@ -1,4 +1,4 @@
-#include "rdbmsDataSource.h"
+#include "connectionLoader.h"
 #include "../libodbcpp/connection.h"
 typedef ODBC::Connection ODBCConnection;
 DECLARE_COMPONENT_LOADER("odbc", ODBCConnection, ConnectionLoader)
diff --git a/project2/sql-modPQ.cpp b/project2/sql/sql-modPQ.cpp
index 499d8e7..5991754 100644
--- a/project2/sql-modPQ.cpp
+++ b/project2/sql/sql-modPQ.cpp
@@ -1,4 +1,4 @@
-#include "rdbmsDataSource.h"
+#include "connectionLoader.h"
 #include "../libpqpp/connection.h"
 typedef PQ::Connection PQConnection;
 DECLARE_COMPONENT_LOADER("postgresql", PQConnection, ConnectionLoader)
diff --git a/project2/sqlCache.cpp b/project2/sql/sqlCache.cpp
index 13bc23d..13bc23d 100644
--- a/project2/sqlCache.cpp
+++ b/project2/sql/sqlCache.cpp
diff --git a/project2/sqlCheck.cpp b/project2/sql/sqlCheck.cpp
index d86eb3b..d86eb3b 100644
--- a/project2/sqlCheck.cpp
+++ b/project2/sql/sqlCheck.cpp
diff --git a/project2/sqlCheck.h b/project2/sql/sqlCheck.h
index c9933d7..c9933d7 100644
--- a/project2/sqlCheck.h
+++ b/project2/sql/sqlCheck.h
diff --git a/project2/sqlHandleAsVariableType.cpp b/project2/sql/sqlHandleAsVariableType.cpp
index f084a14..f084a14 100644
--- a/project2/sqlHandleAsVariableType.cpp
+++ b/project2/sql/sqlHandleAsVariableType.cpp
diff --git a/project2/sqlHandleAsVariableType.h b/project2/sql/sqlHandleAsVariableType.h
index c874b7c..c874b7c 100644
--- a/project2/sqlHandleAsVariableType.h
+++ b/project2/sql/sqlHandleAsVariableType.h
diff --git a/project2/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp
index 09657f8..09657f8 100644
--- a/project2/sqlMergeTask.cpp
+++ b/project2/sql/sqlMergeTask.cpp
diff --git a/project2/sqlMergeTask.h b/project2/sql/sqlMergeTask.h
index c9e206c..c9e206c 100644
--- a/project2/sqlMergeTask.h
+++ b/project2/sql/sqlMergeTask.h
diff --git a/project2/sqlRows.cpp b/project2/sql/sqlRows.cpp
index 6e506d7..6e506d7 100644
--- a/project2/sqlRows.cpp
+++ b/project2/sql/sqlRows.cpp
diff --git a/project2/sqlRows.h b/project2/sql/sqlRows.h
index 5614fa1..5614fa1 100644
--- a/project2/sqlRows.h
+++ b/project2/sql/sqlRows.h
diff --git a/project2/sqlTask.cpp b/project2/sql/sqlTask.cpp
index 3a1d334..3a1d334 100644
--- a/project2/sqlTask.cpp
+++ b/project2/sql/sqlTask.cpp
diff --git a/project2/sqlTask.h b/project2/sql/sqlTask.h
index 384b000..384b000 100644
--- a/project2/sqlTask.h
+++ b/project2/sql/sqlTask.h
diff --git a/project2/sqlVariableBinder.cpp b/project2/sql/sqlVariableBinder.cpp
index 23c24f2..23c24f2 100644
--- a/project2/sqlVariableBinder.cpp
+++ b/project2/sql/sqlVariableBinder.cpp
diff --git a/project2/sqlVariableBinder.h b/project2/sql/sqlVariableBinder.h
index df3879a..df3879a 100644
--- a/project2/sqlVariableBinder.h
+++ b/project2/sql/sqlVariableBinder.h
diff --git a/project2/sqlWriter.cpp b/project2/sql/sqlWriter.cpp
index 88d9801..88d9801 100644
--- a/project2/sqlWriter.cpp
+++ b/project2/sql/sqlWriter.cpp
diff --git a/project2/sqlWriter.h b/project2/sql/sqlWriter.h
index 7693e19..7693e19 100644
--- a/project2/sqlWriter.h
+++ b/project2/sql/sqlWriter.h
diff --git a/project2/tablepatch.cpp b/project2/sql/tablepatch.cpp
index f87f60e..f87f60e 100644
--- a/project2/tablepatch.cpp
+++ b/project2/sql/tablepatch.cpp
diff --git a/project2/tablepatch.h b/project2/sql/tablepatch.h
index 0174294..0174294 100644
--- a/project2/tablepatch.h
+++ b/project2/sql/tablepatch.h
diff --git a/project2/url/Jamfile.jam b/project2/url/Jamfile.jam
new file mode 100644
index 0000000..6e6dc36
--- /dev/null
+++ b/project2/url/Jamfile.jam
@@ -0,0 +1,20 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+lib curl : : <name>curl ;
+
+lib p2url :
+	urlRows.cpp
+	curlHelper.cpp
+	../../libmisc/curlsup.cpp
+	:
+	<library>../common//p2common
+	<library>../files//p2files
+	<include>../../libmisc
+	<library>libxmlpp
+	<library>curl
+	: :
+	<include>.
+	<library>curl
+	;
+
diff --git a/project2/curlHelper.cpp b/project2/url/curlHelper.cpp
index 7c204aa..7c204aa 100644
--- a/project2/curlHelper.cpp
+++ b/project2/url/curlHelper.cpp
diff --git a/project2/curlHelper.h b/project2/url/curlHelper.h
index afebcdc..afebcdc 100644
--- a/project2/curlHelper.h
+++ b/project2/url/curlHelper.h
diff --git a/project2/urlRows.cpp b/project2/url/urlRows.cpp
index f8f7eed..f8f7eed 100644
--- a/project2/urlRows.cpp
+++ b/project2/url/urlRows.cpp
diff --git a/project2/urlRows.h b/project2/url/urlRows.h
index 98273bd..98273bd 100644
--- a/project2/urlRows.h
+++ b/project2/url/urlRows.h
diff --git a/project2/uuid/Jamfile.jam b/project2/uuid/Jamfile.jam
new file mode 100644
index 0000000..a0d160b
--- /dev/null
+++ b/project2/uuid/Jamfile.jam
@@ -0,0 +1,12 @@
+lib osspuuid : : <name>ossp-uuid++ ;
+
+lib p2uuid :
+	uuid.cpp
+	:
+	<uuid>ossp:<define>OSSP_UUID
+	<uuid>boost:<define>BOOST_UUID
+	<uuid>ossp:<library>osspuuid
+	: :
+	<include>.
+	;
+
diff --git a/project2/uuid.cpp b/project2/uuid/uuid.cpp
index ddc0e50..ddc0e50 100644
--- a/project2/uuid.cpp
+++ b/project2/uuid/uuid.cpp
diff --git a/project2/uuid.h b/project2/uuid/uuid.h
index 4c60ae5..4c60ae5 100644
--- a/project2/uuid.h
+++ b/project2/uuid/uuid.h
diff --git a/project2/xml/Jamfile.jam b/project2/xml/Jamfile.jam
new file mode 100644
index 0000000..0cd4e1e
--- /dev/null
+++ b/project2/xml/Jamfile.jam
@@ -0,0 +1,25 @@
+alias libxmlpp : : : :
+	<cflags>"`pkg-config --cflags libxml++-2.6`"
+	<linkflags>"`pkg-config --libs libxml++-2.6`" ;
+alias libxslt : : : :
+	<cflags>"`pkg-config --cflags libexslt`"
+	<linkflags>"`pkg-config --libs libexslt`" ;
+lib boost_filesystem : : <name>boost_filesystem ;
+
+lib p2xml :
+	rawView.cpp xmlPresenter.cpp transformHtml.cpp transformText.cpp xmlRows.cpp
+	xmlRawRows.cpp xslRows.cpp xslRowsCache.cpp xslPreFetch.cpp xmlMemCache.cpp xmlCache.cpp sessionXml.cpp
+	:
+	<include>../libmisc
+	<library>libxmlpp
+	<library>../common//p2common
+	<library>../uuid//p2uuid
+	<library>../url//p2url
+	<library>libxslt
+	<library>boost_filesystem
+	: :
+	<library>../uuid//p2uuid
+	<include>.
+	;
+
+
diff --git a/project2/rawView.cpp b/project2/xml/rawView.cpp
index 90569c9..90569c9 100644
--- a/project2/rawView.cpp
+++ b/project2/xml/rawView.cpp
diff --git a/project2/rawView.h b/project2/xml/rawView.h
index b192c89..b192c89 100644
--- a/project2/rawView.h
+++ b/project2/xml/rawView.h
diff --git a/project2/sessionXml.cpp b/project2/xml/sessionXml.cpp
index c1e2158..c1e2158 100644
--- a/project2/sessionXml.cpp
+++ b/project2/xml/sessionXml.cpp
diff --git a/project2/sessionXml.h b/project2/xml/sessionXml.h
index 9b5c3e1..9b5c3e1 100644
--- a/project2/sessionXml.h
+++ b/project2/xml/sessionXml.h
diff --git a/project2/transformHtml.cpp b/project2/xml/transformHtml.cpp
index eae1c27..eae1c27 100644
--- a/project2/transformHtml.cpp
+++ b/project2/xml/transformHtml.cpp
diff --git a/project2/transformHtml.h b/project2/xml/transformHtml.h
index 25bd0d5..25bd0d5 100644
--- a/project2/transformHtml.h
+++ b/project2/xml/transformHtml.h
diff --git a/project2/transformText.cpp b/project2/xml/transformText.cpp
index 5ba03cc..5ba03cc 100644
--- a/project2/transformText.cpp
+++ b/project2/xml/transformText.cpp
diff --git a/project2/transformText.h b/project2/xml/transformText.h
index 9a81c89..9a81c89 100644
--- a/project2/transformText.h
+++ b/project2/xml/transformText.h
diff --git a/project2/xmlCache.cpp b/project2/xml/xmlCache.cpp
index 86b098a..86b098a 100644
--- a/project2/xmlCache.cpp
+++ b/project2/xml/xmlCache.cpp
diff --git a/project2/xmlMemCache.cpp b/project2/xml/xmlMemCache.cpp
index af54eb5..af54eb5 100644
--- a/project2/xmlMemCache.cpp
+++ b/project2/xml/xmlMemCache.cpp
diff --git a/project2/xmlPresenter.cpp b/project2/xml/xmlPresenter.cpp
index adaed38..adaed38 100644
--- a/project2/xmlPresenter.cpp
+++ b/project2/xml/xmlPresenter.cpp
diff --git a/project2/xmlPresenter.h b/project2/xml/xmlPresenter.h
index ae40470..ae40470 100644
--- a/project2/xmlPresenter.h
+++ b/project2/xml/xmlPresenter.h
diff --git a/project2/xmlRawRows.cpp b/project2/xml/xmlRawRows.cpp
index 68a4e8c..68a4e8c 100644
--- a/project2/xmlRawRows.cpp
+++ b/project2/xml/xmlRawRows.cpp
diff --git a/project2/xmlRawRows.h b/project2/xml/xmlRawRows.h
index a4e7899..a4e7899 100644
--- a/project2/xmlRawRows.h
+++ b/project2/xml/xmlRawRows.h
diff --git a/project2/xmlRows.cpp b/project2/xml/xmlRows.cpp
index 8982945..8982945 100644
--- a/project2/xmlRows.cpp
+++ b/project2/xml/xmlRows.cpp
diff --git a/project2/xmlRows.h b/project2/xml/xmlRows.h
index 3ab889e..3ab889e 100644
--- a/project2/xmlRows.h
+++ b/project2/xml/xmlRows.h
diff --git a/project2/xslPreFetch.cpp b/project2/xml/xslPreFetch.cpp
index b70d83c..b70d83c 100644
--- a/project2/xslPreFetch.cpp
+++ b/project2/xml/xslPreFetch.cpp
diff --git a/project2/xslPreFetch.h b/project2/xml/xslPreFetch.h
index c9e6a9a..c9e6a9a 100644
--- a/project2/xslPreFetch.h
+++ b/project2/xml/xslPreFetch.h
diff --git a/project2/xslRows.cpp b/project2/xml/xslRows.cpp
index 07d57b6..07d57b6 100644
--- a/project2/xslRows.cpp
+++ b/project2/xml/xslRows.cpp
diff --git a/project2/xslRows.h b/project2/xml/xslRows.h
index e33932f..e33932f 100644
--- a/project2/xslRows.h
+++ b/project2/xml/xslRows.h
diff --git a/project2/xslRowsCache.cpp b/project2/xml/xslRowsCache.cpp
index 5cbc44c..5cbc44c 100644
--- a/project2/xslRowsCache.cpp
+++ b/project2/xml/xslRowsCache.cpp
diff --git a/project2/xslRowsCache.h b/project2/xml/xslRowsCache.h
index 55b8674..55b8674 100644
--- a/project2/xslRowsCache.h
+++ b/project2/xml/xslRowsCache.h