Refactoring finished

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

2 files changed, 38 insertions, 39 deletions

diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index 0e617b9..b4ee3eb 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -1,6 +1,5 @@
-#include "uscxml/Common.h"
 #include "USCXMLInvoker.h"
-#include "uscxml/Interpreter.h"
+#include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
@@ -10,53 +9,53 @@ namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
 PLUMA_CONNECTOR
-bool connect(pluma::Host& host){
-    host.add( new USCXMLInvokerProvider() );
-    return true;
+bool connect(pluma::Host& host) {
+	host.add( new USCXMLInvokerProvider() );
+	return true;
 }
 #endif
 
-USCXMLInvoker::USCXMLInvoker() {	
+USCXMLInvoker::USCXMLInvoker() {
 }
 
-  
+
 USCXMLInvoker::~USCXMLInvoker() {
-  delete _invokedInterpreter;
+	delete _invokedInterpreter;
 };
-  
+
 Invoker* USCXMLInvoker::create(Interpreter* interpreter) {
-  USCXMLInvoker* invoker = new USCXMLInvoker();
-  invoker->_parentInterpreter = interpreter;
-  return invoker;
+	USCXMLInvoker* invoker = new USCXMLInvoker();
+	invoker->_parentInterpreter = interpreter;
+	return invoker;
 }
 
 Data USCXMLInvoker::getDataModelVariables() {
-  Data data;
-  return data;
+	Data data;
+	return data;
 }
 
 void USCXMLInvoker::send(SendRequest& req) {
-  assert(false);
+	assert(false);
 }
 
 void USCXMLInvoker::cancel(const std::string sendId) {
-  assert(false);  
+	assert(false);
 }
 
 void USCXMLInvoker::sendToParent(SendRequest& req) {
-  req.invokeid = _invokeId;
-  _parentInterpreter->receive(req);
+	req.invokeid = _invokeId;
+	_parentInterpreter->receive(req);
 }
 
 void USCXMLInvoker::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  _invokedInterpreter = Interpreter::fromURI(req.src);
-  DataModel* dataModel = _invokedInterpreter->getDataModel();
-  if (dataModel != NULL) {
-    
-  }
-  _invokedInterpreter->setInvoker(this);
-  _invokedInterpreter->start();
+	_invokeId = req.invokeid;
+	_invokedInterpreter = Interpreter::fromURI(req.src);
+	DataModel* dataModel = _invokedInterpreter->getDataModel();
+	if (dataModel != NULL) {
+
+	}
+	_invokedInterpreter->setInvoker(this);
+	_invokedInterpreter->start();
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
index 9068a24..907df41 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
@@ -1,7 +1,7 @@
 #ifndef USCXMLINVOKER_H_OQFA21IO
 #define USCXMLINVOKER_H_OQFA21IO
 
-#include "uscxml/Factory.h"
+#include <uscxml/Interpreter.h>
 
 #ifdef BUILD_AS_PLUGINS
 #include "uscxml/plugins/Plugins.h"
@@ -10,13 +10,13 @@
 namespace uscxml {
 
 class Interpreter;
-  
+
 class USCXMLInvoker : public Invoker {
 public:
 	USCXMLInvoker();
-  virtual ~USCXMLInvoker();
-  virtual Invoker* create(Interpreter* interpreter);
-  virtual std::set<std::string> getNames() {
+	virtual ~USCXMLInvoker();
+	virtual Invoker* create(Interpreter* interpreter);
+	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
 		names.insert("uscxml");
 		names.insert("http://www.w3.org/TR/scxml");
@@ -24,16 +24,16 @@ public:
 		return names;
 	}
 
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
 protected:
-  std::string _invokeId;
-  Interpreter* _invokedInterpreter;
-  Interpreter* _parentInterpreter;
+	std::string _invokeId;
+	Interpreter* _invokedInterpreter;
+	Interpreter* _parentInterpreter;
 };
 
 #ifdef BUILD_AS_PLUGINS