Removed interpreter global features

3 files changed, 3 insertions, 34 deletions

diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp
index 787e0ff..46974f2 100644
--- a/src/uscxml/Factory.cpp
+++ b/src/uscxml/Factory.cpp
@@ -23,7 +23,7 @@
 
 # ifdef OPENSCENEGRAPH_FOUND
 #   include "uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h"
-#   include "uscxml/plugins/invoker/graphics/openscenegraph/OSGConverter.h"
+#   include "uscxml/plugins/invoker/graphics/openscenegraph/converter/OSGConverter.h"
 # endif
 
 # ifdef MILES_FOUND
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
index ad7bb15..223fe03 100644
--- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
+++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.cpp
@@ -18,20 +18,6 @@ bool connect(pluma::Host& host) {
 #endif
 
 HTTPServletInvoker::HTTPServletInvoker() {
-	_isInterpreterGlobal = false;
-}
-
-HTTPServletInvoker::HTTPServletInvoker(Interpreter* interpreter) {
-	_isInterpreterGlobal = true;
-	_interpreter = interpreter;
-	std::stringstream path;
-	path << _interpreter->getName();
-	int i = 2;
-	while(!HTTPServer::registerServlet(path.str(), this)) {
-		path.clear();
-		path.str();
-		path << _interpreter->getName() << i++;
-	}
 }
 
 HTTPServletInvoker::~HTTPServletInvoker() {
@@ -53,7 +39,6 @@ Data HTTPServletInvoker::getDataModelVariables() {
 }
 
 void HTTPServletInvoker::send(const SendRequest& req) {
-	assert(!_isInterpreterGlobal);
 
 	if (req.name.find("reply.", 0, req.name.length())) {
 		// this is a reply
@@ -85,11 +70,9 @@ void HTTPServletInvoker::send(const SendRequest& req) {
 }
 
 void HTTPServletInvoker::cancel(const std::string sendId) {
-	assert(!_isInterpreterGlobal);
 }
 
 void HTTPServletInvoker::invoke(const InvokeRequest& req) {
-	assert(!_isInterpreterGlobal);
 
 	_invokeId = req.invokeid;
 	if (req.params.find("path") == req.params.end()) {
@@ -121,13 +104,8 @@ void HTTPServletInvoker::httpRecvRequest(const HTTPServer::Request& req) {
 
 	Event event = req;
 
-	if (_isInterpreterGlobal) {
-		event.name = "http." + event.data.compound["type"].atom;
-		event.origin = toStr((uintptr_t)req.curlReq);
-	} else {
-		event.name = _callback;
-		event.data.compound["reqId"] = Data(toStr((uintptr_t)req.curlReq), Data::VERBATIM);
-	}
+	event.name = _callback;
+	event.data.compound["reqId"] = Data(toStr((uintptr_t)req.curlReq), Data::VERBATIM);
 
 	returnEvent(event);
 
diff --git a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
index 024616d..ad89fee 100644
--- a/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
+++ b/src/uscxml/plugins/invoker/http/HTTPServletInvoker.h
@@ -13,7 +13,6 @@ namespace uscxml {
 class HTTPServletInvoker : public InvokerImpl, public HTTPServlet {
 public:
 	HTTPServletInvoker();
-	HTTPServletInvoker(Interpreter* interpreter);
 	virtual ~HTTPServletInvoker();
 	virtual boost::shared_ptr<IOProcessorImpl> create(Interpreter* interpreter);
 
@@ -37,20 +36,12 @@ public:
 	}
 	bool canAdaptPath() { return false; }
 
-	tthread::recursive_mutex& getMutex() {
-		return _mutex;
-	}
-	std::map<std::string, HTTPServer::Request>& getRequests() {
-		return _requests;
-	}
-
 protected:
 	tthread::recursive_mutex _mutex;
 	std::map<std::string, HTTPServer::Request> _requests;
 	std::string _path;
 	std::string _callback;
 	std::string _url;
-	bool _isInterpreterGlobal;
 };
 
 #ifdef BUILD_AS_PLUGINS