Refactoring finished

Support datamodels, invokers and ioprocessors as plugins
Comply to HTTP1.1 by sending host header field
Started prolog datamodel

6 files changed, 163 insertions, 6 deletions

diff --git a/contrib/cmake/FindArabica.cmake b/contrib/cmake/FindArabica.cmake
index fb5423d..7ed0c7d 100644
--- a/contrib/cmake/FindArabica.cmake
+++ b/contrib/cmake/FindArabica.cmake
@@ -9,7 +9,7 @@ FIND_PATH(ARABICA_INCLUDE_DIR Arabica/getparam.hpp
   /opt
   HINTS $ENV{ARABICA_SRC}
 )
-
+set(ARABICA_LIBRARY)
 FIND_LIBRARY(ARABICA_LIBRARY_RELEASE
   NAMES arabica
   HINTS $ENV{ARABICA_SRC}/src/.libs/
@@ -31,4 +31,4 @@ endif()
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Arabica DEFAULT_MSG ARABICA_LIBRARY ARABICA_INCLUDE_DIR)
-MARK_AS_ADVANCED(ARABICA_LIBRARY ARABICA_INCLUDE_DIR)
+MARK_AS_ADVANCED(ARABICA_LIBRARY_RELEASE ARABICA_LIBRARY_DEBUG)
diff --git a/contrib/cmake/FindGMP.cmake b/contrib/cmake/FindGMP.cmake
new file mode 100644
index 0000000..2926a98
--- /dev/null
+++ b/contrib/cmake/FindGMP.cmake
@@ -0,0 +1,42 @@
+FIND_PATH(GMP_INCLUDE_DIR gmp.h
+  PATH_SUFFIXES include
+  PATHS
+  /usr/local
+  /usr
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+  HINTS $ENV{GMP_SRC}
+)
+
+FIND_LIBRARY(GMP_LIBRARY_RELEASE
+  NAMES gmp
+  PATHS
+  /usr/local
+  /usr
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+  HINTS $ENV{GMP_SRC}/.libs/
+)
+if (GMP_LIBRARY_RELEASE)
+	list(APPEND GMP_LIBRARY optimized ${GMP_LIBRARY_RELEASE})
+endif()
+
+FIND_LIBRARY(GMP_LIBRARY_DEBUG
+  NAMES GMP libGMP_static_d
+  HINTS $ENV{GMP_SRC}/.libs/
+)
+if (GMP_LIBRARY_DEBUG)
+	list(APPEND GMP_LIBRARY debug ${GMP_LIBRARY_DEBUG})
+else()
+	if (UNIX)
+		list(APPEND GMP_LIBRARY debug ${GMP_LIBRARY_RELEASE})
+	endif()
+endif()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_LIBRARY GMP_INCLUDE_DIR)
+MARK_AS_ADVANCED(GMP_LIBRARY GMP_INCLUDE_DIR)
diff --git a/contrib/cmake/FindSWI.cmake b/contrib/cmake/FindSWI.cmake
new file mode 100644
index 0000000..9fbdc77
--- /dev/null
+++ b/contrib/cmake/FindSWI.cmake
@@ -0,0 +1,86 @@
+set (SWI_SEARCH_PATHS $ENV{SWI_DIR})
+list (APPEND SWI_SEARCH_PATHS 
+	${CMAKE_FIND_ROOT_PATH}
+	"/usr/lib/swi-prolog/"
+	"/opt/local/"
+	"C:/Program Files (x86)/swipl"
+	"C:/Program Files/swipl"
+)
+
+set(64BIT_HOST OFF)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(64BIT_HOST ON)
+endif()
+
+set (SWI_HOME)
+set (LOOP_DONE 0)
+foreach(SWI_SEARCH_PATH ${SWI_SEARCH_PATHS})
+	if(NOT LOOP_DONE)
+		file(GLOB SWI_VERSIONS ${SWI_SEARCH_PATH}/lib/swipl*)
+		if (SWI_VERSIONS)
+			set(LOOP_DONE 1)
+			list(SORT SWI_VERSIONS)
+			list(REVERSE SWI_VERSIONS)
+			list(GET SWI_VERSIONS 0 SWI_HOME)
+		endif()
+	endif()
+endforeach()
+
+set (SWI_PLATFORM_PATH)
+set (LOOP_DONE 0)
+if (SWI_HOME)
+
+	set(SWI_CPU_SUFFIX ${CMAKE_SYSTEM_PROCESSOR})
+	if (APPLE)
+		if (64BIT_HOST)
+			set(SWI_CPU_SUFFIX "x86_64")
+		endif()
+	endif()
+
+	file(GLOB SWI_PLATFORMS ${SWI_HOME}/lib/*)
+	foreach(SWI_PLATFORM ${SWI_PLATFORMS})
+		STRING(REGEX REPLACE "${SWI_HOME}/lib/" "" REL_SWI_PLATFORM ${SWI_PLATFORM})
+		if(NOT LOOP_DONE)
+			if (REL_SWI_PLATFORM MATCHES ".*${SWI_CPU_SUFFIX}.*")
+				set (SWI_PLATFORM_PATH ${SWI_PLATFORM})
+				set(LOOP_DONE 1)
+			endif()
+		endif()
+	endforeach()
+endif()
+
+#message(STATUS "SWI_PLATFORM_PATH: ${SWI_PLATFORM_PATH}, SWI_HOME: ${SWI_HOME}")
+
+if (SWI_PLATFORM_PATH)
+	FIND_PATH(SWI_INCLUDE_DIR SWI-Prolog.h
+	  PATH_SUFFIXES include
+	  PATHS ${SWI_HOME}
+	)
+	
+	FIND_LIBRARY(SWI_LIBRARY_RELEASE
+	  NAMES libswipl swipl
+		PATHS ${SWI_PLATFORM_PATH}
+	)
+	
+	if (SWI_LIBRARY_RELEASE)
+		list(APPEND SWI_LIBRARY optimized ${SWI_LIBRARY_RELEASE})
+		add_definitions("-DSWI_LIBRARY_PATH=\"${SWI_PLATFORM_PATH}\"")
+	endif()
+
+
+	FIND_LIBRARY(SWI_LIBRARY_DEBUG
+  	NAMES libswipl_d swipl_d
+		PATHS ${SWI_PLATFORM_PATH}
+	)
+	if (SWI_LIBRARY_DEBUG)
+		list(APPEND SWI_LIBRARY debug ${SWI_LIBRARY_DEBUG})
+	elseif(UNIX)
+		list(APPEND SWI_LIBRARY debug ${SWI_LIBRARY_RELEASE})
+	else()
+		message(FATAL_ERROR "Cannot find debug version of SWI")
+	endif()
+endif()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SWI DEFAULT_MSG SWI_LIBRARY SWI_INCLUDE_DIR)
+MARK_AS_ADVANCED(SWI_LIBRARY SWI_INCLUDE_DIR)
diff --git a/contrib/local/beautifyCode.sh b/contrib/local/beautifyCode.sh
new file mode 100755
index 0000000..d6f4c11
--- /dev/null
+++ b/contrib/local/beautifyCode.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# see http://astyle.sourceforge.net/astyle.html
+# run from project root as sh ./contrib/tidy_source.sh
+
+set -e
+
+ME=`basename $0`
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+CWD=`pwd`
+
+astyle  \
+	--style=java \
+	--indent=tab \
+	--recursive "${DIR}/../../src/*.cpp" "${DIR}/../../src/*.h"
+find ${DIR}/../../src/ -iname '*.orig' -exec rm {} \;
+
+astyle  \
+	--style=java \
+	--indent=tab \
+	--recursive "${DIR}/../../test/*.cpp"
+find ${DIR}/../../test/ -iname '*.orig' -exec rm {} \;
+
+astyle  \
+	--style=java \
+	--indent=tab \
+	--recursive "${DIR}/../../apps/*.cpp"
+find ${DIR}/../../apps/ -iname '*.orig' -exec rm {} \;
+
diff --git a/contrib/local/compress_and_upload_deps.sh b/contrib/local/compress_and_upload_deps.sh
index c96ff0b..641219d 100755
--- a/contrib/local/compress_and_upload_deps.sh
+++ b/contrib/local/compress_and_upload_deps.sh
@@ -9,7 +9,7 @@ CWD=`pwd`
 cd $DIR
 
 if [ "$UMUNDO_PREBUILT_HOST" == "" ]; then
-	UMUNDO_PREBUILT_HOST="admin@umundo.tk.informatik.tu-darmstadt.de:/var/www/html/uscxml/prebuilt"
+	UMUNDO_PREBUILT_HOST="admin@uscxml.tk.informatik.tu-darmstadt.de:/var/www/html/uscxml/prebuilt"
 fi
 
 if [ "$1" == "" ] || [ "$2" == "" ]; then
@@ -27,6 +27,6 @@ VERSION=$2
 
 cd ../prebuilt
 
-tar cvzf uscxml-prebuilt-${PLATFORM}-${VERSION}.tgz ${PLATFORM}
-scp uscxml-prebuilt-${PLATFORM}-${VERSION}.tgz ${UMUNDO_PREBUILT_HOST}/
-rm uscxml-prebuilt-${PLATFORM}-${VERSION}.tgz
\ No newline at end of file
+tar cvzf uscxml-prebuilt-${PLATFORM}.tgz ${PLATFORM}
+scp uscxml-prebuilt-${PLATFORM}.tgz ${UMUNDO_PREBUILT_HOST}/${VERSION}
+rm uscxml-prebuilt-${PLATFORM}.tgz
\ No newline at end of file
diff --git a/contrib/prebuilt/uscxml-prebuilt-windows-x86-0.0.1.tgz b/contrib/prebuilt/uscxml-prebuilt-windows-x86-0.0.1.tgz
deleted file mode 100644
index 835bb7a..0000000
--- a/contrib/prebuilt/uscxml-prebuilt-windows-x86-0.0.1.tgz
+++ /dev/null