New version with XHTML invoker

7 files changed, 414 insertions, 375 deletions

diff --git a/apps/uscxml-browser.cpp b/apps/uscxml-browser.cpp
index afe4e7f..39f81d7 100644
--- a/apps/uscxml-browser.cpp
+++ b/apps/uscxml-browser.cpp
@@ -170,7 +170,7 @@ int main(int argc, char** argv) {
 
 	// intialize http server on given port
 	HTTPServer::getInstance(port);
-	
+
 	LOG(INFO) << "Processing " << argv[optind];
 	Interpreter interpreter = Interpreter::fromURI(argv[optind]);
 	if (interpreter) {
diff --git a/apps/w3c-mmi/MMIEventServlet.cpp b/apps/w3c-mmi/MMIEventServlet.cpp
index 5ee1807..cb5136a 100644
--- a/apps/w3c-mmi/MMIEventServlet.cpp
+++ b/apps/w3c-mmi/MMIEventServlet.cpp
@@ -32,179 +32,179 @@ else if (boost::iequals(mmiEvent.getLocalName(), #type)) { \
 }
 
 namespace uscxml {
-	
-	using namespace Arabica::DOM;
-	
-	MMIEventServlet::MMIEventServlet(const std::string& path) : _path(path) {
-		// register at http server
-		bool success = HTTPServer::registerServlet(_path, this);
-		assert(success);
-	}
-	
-	MMIEventServlet::~MMIEventServlet() {
-		HTTPServer* httpServer = HTTPServer::getInstance();
-		httpServer->unregisterServlet(this);
-	}
-	
-	void MMIEventServlet::send(const MMIEvent& mmiEvent) {
-		URL url(mmiEvent.target);
-		url.addMonitor(this);
-		
-		std::stringstream content;
-		content << mmiEvent.toXML();
-		url.setOutContent(content.str());
-		url.download();
-		
-	}
 
-	void MMIEventServlet::httpRecvRequest(const HTTPServer::Request& req) {
+using namespace Arabica::DOM;
 
-		// is this a request from a HTML browser?
-		
-		
-		NameSpacingParser* parser = NameSpacingParser::fromXML(req.data.compound.at("content").atom);
-		if (!parser) {
-			evhttp_send_error(req.curlReq, 402, NULL);
-			return;
-		}
-		
-		Document<std::string> mmiDoc = parser->getDocument();
-		std::cout << mmiDoc.getNamespaceURI() << std::endl;
-		Node<std::string> mmiEvent = mmiDoc.getFirstChild();
-		// get the first element
+MMIEventServlet::MMIEventServlet(const std::string& path) : _path(path) {
+	// register at http server
+	bool success = HTTPServer::registerServlet(_path, this);
+	assert(success);
+}
+
+MMIEventServlet::~MMIEventServlet() {
+	HTTPServer* httpServer = HTTPServer::getInstance();
+	httpServer->unregisterServlet(this);
+}
+
+void MMIEventServlet::send(const MMIEvent& mmiEvent) {
+	URL url(mmiEvent.target);
+	url.addMonitor(this);
+
+	std::stringstream content;
+	content << mmiEvent.toXML();
+	url.setOutContent(content.str());
+	url.download();
+
+}
+
+bool MMIEventServlet::httpRecvRequest(const HTTPServer::Request& req) {
+
+	// is this a request from a HTML browser?
+
+
+	Document<std::string> mmiDoc = NameSpacingParser::fromXML(req.data.compound.at("content").atom).getDocument();
+	if (!mmiDoc) {
+		evhttp_send_error(req.curlReq, 402, NULL);
+		return true;
+	}
+
+	std::cout << mmiDoc.getNamespaceURI() << std::endl;
+	Node<std::string> mmiEvent = mmiDoc.getFirstChild();
+	// get the first element
+	while (mmiEvent && mmiEvent.getNodeType() != Node_base::ELEMENT_NODE) {
+		mmiEvent = mmiEvent.getNextSibling();
+	}
+	// get the contained message
+	if (boost::iequals(mmiEvent.getLocalName(), "mmi")) {
+		mmiEvent = mmiEvent.getFirstChild();
 		while (mmiEvent && mmiEvent.getNodeType() != Node_base::ELEMENT_NODE) {
 			mmiEvent = mmiEvent.getNextSibling();
 		}
-		// get the contained message
-		if (boost::iequals(mmiEvent.getLocalName(), "mmi")) {
-			mmiEvent = mmiEvent.getFirstChild();
-			while (mmiEvent && mmiEvent.getNodeType() != Node_base::ELEMENT_NODE) {
-				mmiEvent = mmiEvent.getNextSibling();
-			}
-		}
-		std::cout << mmiEvent << std::endl;
-		
-		if (!mmiEvent) {
-			evhttp_send_error(req.curlReq, 402, NULL);
-			return;
-		}
+	}
+	std::cout << mmiEvent << std::endl;
 
-		std::set<MMIEventReceiver*>::iterator monIter;
-		if (false) {}
-		MMI_HTTP_EVENT_CASE(NewContextRequest)
-		MMI_HTTP_EVENT_CASE(NewContextResponse)
-		MMI_HTTP_EVENT_CASE(PrepareRequest)
-		MMI_HTTP_EVENT_CASE(PrepareResponse)
-		MMI_HTTP_EVENT_CASE(StartRequest)
-		MMI_HTTP_EVENT_CASE(StartResponse)
-		MMI_HTTP_EVENT_CASE(DoneNotification)
-		MMI_HTTP_EVENT_CASE(CancelRequest)
-		MMI_HTTP_EVENT_CASE(CancelResponse)
-		MMI_HTTP_EVENT_CASE(PauseRequest)
-		MMI_HTTP_EVENT_CASE(PauseResponse)
-		MMI_HTTP_EVENT_CASE(ResumeRequest)
-		MMI_HTTP_EVENT_CASE(ResumeResponse)
-		MMI_HTTP_EVENT_CASE(ExtensionNotification)
-		MMI_HTTP_EVENT_CASE(ClearContextRequest)
-		MMI_HTTP_EVENT_CASE(ClearContextResponse)
-		MMI_HTTP_EVENT_CASE(StatusRequest)
-		MMI_HTTP_EVENT_CASE(StatusResponse)
-		else {
-			LOG(ERROR) << "Unknown MMI Event";
-			evhttp_send_error(req.curlReq, 402, NULL);
-			return;
-		}
-		
-		evhttp_send_reply(req.curlReq, 204, NULL, NULL);
+	if (!mmiEvent) {
+		evhttp_send_error(req.curlReq, 402, NULL);
+		return true;
+	}
+
+	std::set<MMIEventReceiver*>::iterator monIter;
+	if (false) {}
+	MMI_HTTP_EVENT_CASE(NewContextRequest)
+	MMI_HTTP_EVENT_CASE(NewContextResponse)
+	MMI_HTTP_EVENT_CASE(PrepareRequest)
+	MMI_HTTP_EVENT_CASE(PrepareResponse)
+	MMI_HTTP_EVENT_CASE(StartRequest)
+	MMI_HTTP_EVENT_CASE(StartResponse)
+	MMI_HTTP_EVENT_CASE(DoneNotification)
+	MMI_HTTP_EVENT_CASE(CancelRequest)
+	MMI_HTTP_EVENT_CASE(CancelResponse)
+	MMI_HTTP_EVENT_CASE(PauseRequest)
+	MMI_HTTP_EVENT_CASE(PauseResponse)
+	MMI_HTTP_EVENT_CASE(ResumeRequest)
+	MMI_HTTP_EVENT_CASE(ResumeResponse)
+	MMI_HTTP_EVENT_CASE(ExtensionNotification)
+	MMI_HTTP_EVENT_CASE(ClearContextRequest)
+	MMI_HTTP_EVENT_CASE(ClearContextResponse)
+	MMI_HTTP_EVENT_CASE(StatusRequest)
+	MMI_HTTP_EVENT_CASE(StatusResponse)
+	else {
+		LOG(ERROR) << "Unknown MMI Event";
+		evhttp_send_error(req.curlReq, 402, NULL);
+		return true;
+	}
+
+	evhttp_send_reply(req.curlReq, 204, NULL, NULL);
 
 #if 0
-		Event reqEvent = req;
-		reqEvent.type = Event::EXTERNAL;
-		bool scxmlStructFound = false;
-		
-		if (reqEvent.data.compound["header"].compound.find("Content-Type") != reqEvent.data.compound["header"].compound.end() &&
-				boost::iequals(reqEvent.data.compound["header"].compound["Content-Type"].atom, "application/x-www-form-urlencoded")) {
-			std::stringstream ss(reqEvent.data.compound["content"].atom);
-			std::string term;
-			while(std::getline(ss, term, '&')) {
-				size_t split = term.find_first_of("=");
-				if (split != std::string::npos) {
-					std::string key = evhttp_decode_uri(term.substr(0, split).c_str());
-					std::string value = evhttp_decode_uri(term.substr(split + 1).c_str());
-					if (boost::iequals(key, "_scxmleventname")) {
-						reqEvent.name = value;
-					} else if (boost::iequals(key, "content")) {
-						reqEvent.initContent(value);
-					} else {
-						reqEvent.data.compound[key] = value;
-						reqEvent.params.insert(std::make_pair(key, value));
-					}
+	Event reqEvent = req;
+	reqEvent.type = Event::EXTERNAL;
+	bool scxmlStructFound = false;
+
+	if (reqEvent.data.compound["header"].compound.find("Content-Type") != reqEvent.data.compound["header"].compound.end() &&
+	        boost::iequals(reqEvent.data.compound["header"].compound["Content-Type"].atom, "application/x-www-form-urlencoded")) {
+		std::stringstream ss(reqEvent.data.compound["content"].atom);
+		std::string term;
+		while(std::getline(ss, term, '&')) {
+			size_t split = term.find_first_of("=");
+			if (split != std::string::npos) {
+				std::string key = evhttp_decode_uri(term.substr(0, split).c_str());
+				std::string value = evhttp_decode_uri(term.substr(split + 1).c_str());
+				if (boost::iequals(key, "_scxmleventname")) {
+					reqEvent.name = value;
+				} else if (boost::iequals(key, "content")) {
+					reqEvent.initContent(value);
 				} else {
-					// this is most likely wrong
-					reqEvent.content = evhttp_decode_uri(term.c_str());
+					reqEvent.data.compound[key] = value;
+					reqEvent.params.insert(std::make_pair(key, value));
 				}
-			}
-		} else {
-			if (reqEvent.data.compound["header"].compound.find("_scxmleventstruct") != reqEvent.data.compound["header"].compound.end()) {
-				// TODO: this looses all other information
-				reqEvent = Event::fromXML(evhttp_decode_uri(reqEvent.data.compound["header"].compound["_scxmleventstruct"].atom.c_str()));
-				scxmlStructFound = true;
-			}
-			if (reqEvent.data.compound["header"].compound.find("_scxmleventname") != reqEvent.data.compound["header"].compound.end()) {
-				reqEvent.name = evhttp_decode_uri(reqEvent.data.compound["header"].compound["_scxmleventname"].atom.c_str());
+			} else {
+				// this is most likely wrong
+				reqEvent.content = evhttp_decode_uri(term.c_str());
 			}
 		}
-		std::map<std::string, Data>::iterator headerIter = reqEvent.data.compound["header"].compound.begin();
-		while(headerIter != reqEvent.data.compound["header"].compound.end()) {
-			reqEvent.data.compound[headerIter->first] = Data(evhttp_decode_uri(headerIter->second.atom.c_str()), Data::VERBATIM);
-			headerIter++;
+	} else {
+		if (reqEvent.data.compound["header"].compound.find("_scxmleventstruct") != reqEvent.data.compound["header"].compound.end()) {
+			// TODO: this looses all other information
+			reqEvent = Event::fromXML(evhttp_decode_uri(reqEvent.data.compound["header"].compound["_scxmleventstruct"].atom.c_str()));
+			scxmlStructFound = true;
 		}
-		
-		
-		/// test532
-		if (reqEvent.name.length() == 0)
-			reqEvent.name = "http." + req.data.compound.at("type").atom;
-		
-		if (!scxmlStructFound) {
-			// get content into event
-			reqEvent.data.compound["content"] = Data(req.content, Data::VERBATIM);
+		if (reqEvent.data.compound["header"].compound.find("_scxmleventname") != reqEvent.data.compound["header"].compound.end()) {
+			reqEvent.name = evhttp_decode_uri(reqEvent.data.compound["header"].compound["_scxmleventname"].atom.c_str());
 		}
-		
-		evhttp_send_reply(req.curlReq, 200, "OK", NULL);
-#endif
 	}
-		
-	void MMIEventServlet::downloadStarted(const URL& url) {}
-	
-	void MMIEventServlet::downloadCompleted(const URL& url) {
-		std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
-		while(reqIter != _sendRequests.end()) {
-			if (reqIter->second.first == url) {
-				_sendRequests.erase(reqIter);
-				return;
-			}
-			reqIter++;
+	std::map<std::string, Data>::iterator headerIter = reqEvent.data.compound["header"].compound.begin();
+	while(headerIter != reqEvent.data.compound["header"].compound.end()) {
+		reqEvent.data.compound[headerIter->first] = Data(evhttp_decode_uri(headerIter->second.atom.c_str()), Data::VERBATIM);
+		headerIter++;
+	}
+
+
+	/// test532
+	if (reqEvent.name.length() == 0)
+		reqEvent.name = "http." + req.data.compound.at("type").atom;
+
+	if (!scxmlStructFound) {
+		// get content into event
+		reqEvent.data.compound["content"] = Data(req.content, Data::VERBATIM);
+	}
+
+	evhttp_send_reply(req.curlReq, 200, "OK", NULL);
+#endif
+	return true;
+}
+
+void MMIEventServlet::downloadStarted(const URL& url) {}
+
+void MMIEventServlet::downloadCompleted(const URL& url) {
+	std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
+	while(reqIter != _sendRequests.end()) {
+		if (reqIter->second.first == url) {
+			_sendRequests.erase(reqIter);
+			return;
 		}
-		assert(false);
+		reqIter++;
 	}
-	
-	void MMIEventServlet::downloadFailed(const URL& url, int errorCode) {
-		
-		std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
-		while(reqIter != _sendRequests.end()) {
-			if (reqIter->second.first == url) {
-				Event failEvent;
-				failEvent.name = "error.communication";
+	assert(false);
+}
+
+void MMIEventServlet::downloadFailed(const URL& url, int errorCode) {
+
+	std::map<std::string, std::pair<URL, SendRequest> >::iterator reqIter = _sendRequests.begin();
+	while(reqIter != _sendRequests.end()) {
+		if (reqIter->second.first == url) {
+			Event failEvent;
+			failEvent.name = "error.communication";
 //				returnEvent(failEvent);
-				
-				_sendRequests.erase(reqIter);
-				return;
-			}
-			reqIter++;
+
+			_sendRequests.erase(reqIter);
+			return;
 		}
-		assert(false);
-		
+		reqIter++;
 	}
-	
-	
+	assert(false);
+
+}
+
+
 }
\ No newline at end of file
diff --git a/apps/w3c-mmi/MMIEventServlet.h b/apps/w3c-mmi/MMIEventServlet.h
index 10adbc3..d760149 100644
--- a/apps/w3c-mmi/MMIEventServlet.h
+++ b/apps/w3c-mmi/MMIEventServlet.h
@@ -30,7 +30,7 @@ namespace uscxml {
 		}
 		
 		/// HTTPServlet
-		void httpRecvRequest(const HTTPServer::Request& req);
+		bool httpRecvRequest(const HTTPServer::Request& req);
 		void setURL(const std::string& url) {
 			_url = url;
 		}
diff --git a/apps/w3c-mmi/im/MMISessionManager.cpp b/apps/w3c-mmi/im/MMISessionManager.cpp
index 768a8a1..83d4dea 100644
--- a/apps/w3c-mmi/im/MMISessionManager.cpp
+++ b/apps/w3c-mmi/im/MMISessionManager.cpp
@@ -7,251 +7,290 @@
 
 namespace uscxml {
 
-	using namespace Arabica::DOM;
+using namespace Arabica::DOM;
 
-	MMISessionManager::MMISessionManager(Interpreter interpreter) : _protoInterpreter(interpreter) {
-		bool success = HTTPServer::registerServlet(interpreter.getName(), this);
-		assert(success);
-		_factory = new Factory(Factory::getInstance());
-		_factory->registerIOProcessor(new MMIIOProcessor(this));
-	}
+MMISessionManager::MMISessionManager(Interpreter interpreter) : _protoInterpreter(interpreter) {
+	bool success = HTTPServer::registerServlet(interpreter.getName(), this);
+	assert(success);
+	_factory = new Factory(Factory::getInstance());
+	_factory->registerIOProcessor(new MMIIOProcessor(this));
+}
 
-	MMISessionManager::~MMISessionManager() {
-		HTTPServer* httpServer = HTTPServer::getInstance();
-		httpServer->unregisterServlet(this);
-	}
-	
-	void MMISessionManager::setupHTMLClient(const HTTPServer::Request& req) {
-		// open template file
-		HTTPServer::Reply reply(req);
-		URL templateURL(_protoInterpreter.getBaseURI().asString() + "/templates/mc-html.html");
-		templateURL.download(true);
-		std::string templateContent = templateURL.getInContent();
-		boost::replace_all(templateContent, "${im.url}", _url);
-		reply.content = templateContent;
-		HTTPServer::reply(reply);
+MMISessionManager::~MMISessionManager() {
+	HTTPServer* httpServer = HTTPServer::getInstance();
+	httpServer->unregisterServlet(this);
+}
+
+void MMISessionManager::setupHTMLClient(const HTTPServer::Request& req) {
+	// open template file
+	HTTPServer::Reply reply(req);
+	URL templateURL(_protoInterpreter.getBaseURI().asString() + "/templates/mc-html.html");
+	templateURL.download(true);
+	std::string templateContent = templateURL.getInContent();
+	boost::replace_all(templateContent, "${im.url}", _url);
+	reply.content = templateContent;
+	HTTPServer::reply(reply);
+}
+
+bool MMISessionManager::httpRecvRequest(const HTTPServer::Request& req) {
+	// is this an initial request from an HTML MC?
+	if (!req.data["query"]["token"] && // no token in query
+	        !req.data["query"]["context"] && // no context in query
+	        boost::iequals(req.data["type"].atom, "get") && // request type is GET
+	        boost::icontains(req.data["header"]["Accept"].atom, "text/html") && // accepts html
+	        req.content.length() == 0) { // no content
+		setupHTMLClient(req);
+		return true;
 	}
 
-	void MMISessionManager::httpRecvRequest(const HTTPServer::Request& req) {
-		// is this an initial request from an HTML MC?
-		if (!req.data["query"]["token"] && // no token in query
-				boost::iequals(req.data["type"].atom, "get") && // request type is GET
-				boost::icontains(req.data["header"]["Accept"].atom, "text/html") && // accepts html
-				req.content.length() == 0) { // no content
-			setupHTMLClient(req);
-			return;
-		}
-		
-		// is this a comet longpolling request?
-		if (req.data["query"]["token"] &&
-				boost::iequals(req.data["type"].atom, "get")) {
+	// is this a comet longpolling request?
+	if (boost::iequals(req.data["type"].atom, "get") &&
+	        (req.data["query"]["token"] || req.data["query"]["context"])) {
+		std::string token = req.data["query"]["token"].atom;
+		if (req.data["query"]["token"]) {
 			std::string token = req.data["query"]["token"].atom;
 			if (_tokens.find(token) != _tokens.end()) {
 				MMISessionManager::CometMMISession* comet = static_cast<MMISessionManager::CometMMISession*>(_tokens[token]);
 				comet->longPoll(req);
-				return;
+				return true;
+			} else {
+				LOG(ERROR) << "No session for given token";
+			}
+		} else if (req.data["query"]["context"]) {
+			std::string context = req.data["query"]["context"].atom;
+			if (_sessions.find(context) != _sessions.end()) {
+				MMISessionManager::CometMMISession* comet = static_cast<MMISessionManager::CometMMISession*>(_sessions[context]);
+				comet->longPoll(req);
+				return true;
+			} else {
+				LOG(ERROR) << "No session for given context";
 			}
 		}
+	}
 
-		// assume that there is an mmi event inside
-		NameSpacingParser* parser = NameSpacingParser::fromXML(req.data.compound.at("content").atom);
-		if (!parser) {
-			evhttp_send_error(req.curlReq, 204, NULL);
-			return;
-		}
+	// assume that there is an mmi event inside
+	Document<std::string> mmiDoc = NameSpacingParser::fromXML(req.data.compound.at("content").atom).getDocument();
 
-		Node<std::string> mmiEvent = MMIEvent::getEventNode(parser->getDocument());
-		if (!mmiEvent) {
-			evhttp_send_error(req.curlReq, 204, NULL);
-			return;
-		}		
+	if (!mmiDoc) {
+		evhttp_send_error(req.curlReq, 204, NULL);
+		return true;
+	}
 
-		switch(MMIEvent::getType(mmiEvent)) {
-			case MMIEvent::NEWCONTEXTREQUEST: {
-				received(NewContextRequest::fromXML(mmiEvent), req.data["query"]["token"].atom);
-				evhttp_send_error(req.curlReq, 204, NULL);
-				break;
-			}
-			case MMIEvent::EXTENSIONNOTIFICATION: {
-				received(ExtensionNotification::fromXML(mmiEvent));
-				evhttp_send_error(req.curlReq, 204, NULL);
-				break;
-			}
-			default: {
-				LOG(ERROR) << "Unknown MMI Event";
-				evhttp_send_error(req.curlReq, 204, NULL);
-				break;
-			}
-		}
+	Node<std::string> mmiEvent = MMIEvent::getEventNode(mmiDoc);
+	if (!mmiEvent) {
+		evhttp_send_error(req.curlReq, 204, NULL);
+		return true;
 	}
-	
-	void MMISessionManager::received(const ExtensionNotification& mmiEvent) {
-		assert(_sessions.find(mmiEvent.context) != _sessions.end());
+
+	switch(MMIEvent::getType(mmiEvent)) {
+	case MMIEvent::NEWCONTEXTREQUEST: {
+		received(NewContextRequest::fromXML(mmiEvent), req.data["query"]["token"].atom);
+		evhttp_send_error(req.curlReq, 204, NULL);
+		break;
+	}
+	case MMIEvent::EXTENSIONNOTIFICATION: {
+		received(ExtensionNotification::fromXML(mmiEvent));
+		evhttp_send_error(req.curlReq, 204, NULL);
+		break;
+	}
+	case MMIEvent::DONENOTIFICATION: {
+		received(DoneNotification::fromXML(mmiEvent));
+		evhttp_send_error(req.curlReq, 204, NULL);
+		break;
+	}
+	case MMIEvent::STARTRESPONSE: {
+		evhttp_send_error(req.curlReq, 204, NULL);
+		break;
+	}
+	default: {
+		LOG(ERROR) << "Unknown MMI Event: " << ATTR(mmiEvent, "localName");
+		evhttp_send_error(req.curlReq, 204, NULL);
+		break;
+	}
+	}
+	return true;
+}
+
+void MMISessionManager::received(const ExtensionNotification& mmiEvent) {
+	if(_sessions.find(mmiEvent.context) != _sessions.end()) {
 		_sessions[mmiEvent.context]->_interpreter.receive(mmiEvent);
+	} else {
+		LOG(ERROR) << "No session for given context";
 	}
-	
-	void MMISessionManager::received(const NewContextRequest& mmiEvent, const std::string& token) {
-
-		// copy DOM from prototype instance
-		Arabica::DOM::DOMImplementation<std::string> domFactory = Arabica::SimpleDOM::DOMImplementation<std::string>::getDOMImplementation();
-		Arabica::DOM::Document<std::string> newDOM = domFactory.createDocument("", "", 0);
-		newDOM.appendChild(newDOM.importNode(_protoInterpreter.getDocument().getDocumentElement(), true));
-
-		// instantiate new interpreter and name it after the context
-		std::string contextId = Interpreter::getUUID();
-		Interpreter interpreter = Interpreter::fromDOM(newDOM);
-		interpreter.setFactory(_factory);
-		interpreter.setName(contextId);
-		interpreter.setNameSpaceInfo(_protoInterpreter.getNameSpaceInfo());
-		interpreter.setBaseURI(_protoInterpreter.getBaseURI().asString());
-		
-		MMISession* session;
-		
-		if (token.length() > 0) {
-			session = new MMISessionManager::CometMMISession();
-			static_cast<MMISessionManager::CometMMISession*>(session)->_token = token;
-			_tokens[token] = session;
-		} else {
-			// todo handle other cases
-			session = new MMISessionManager::CometMMISession();
-		}
-		session->_interpreter = interpreter;
-		
-		// save interpreter
-		_sessions[contextId] = session;
-		
-		interpreter.start();
-		interpreter.receive(mmiEvent);
+}
 
+void MMISessionManager::received(const DoneNotification& mmiEvent) {
+	if(_sessions.find(mmiEvent.context) != _sessions.end()) {
+		_sessions[mmiEvent.context]->_interpreter.receive(mmiEvent);
+	} else {
+		LOG(ERROR) << "No session for given context";
 	}
+}
+
+void MMISessionManager::received(const NewContextRequest& mmiEvent, const std::string& token) {
+
+	// copy DOM from prototype instance
+	Arabica::DOM::DOMImplementation<std::string> domFactory = Arabica::SimpleDOM::DOMImplementation<std::string>::getDOMImplementation();
+	Arabica::DOM::Document<std::string> newDOM = domFactory.createDocument("", "", 0);
+	newDOM.appendChild(newDOM.importNode(_protoInterpreter.getDocument().getDocumentElement(), true));
+
+	// instantiate new interpreter and name it after the context
+	std::string contextId = Interpreter::getUUID();
+	Interpreter interpreter = Interpreter::fromDOM(newDOM);
+	interpreter.setFactory(_factory);
+	interpreter.setName(contextId);
+	interpreter.setNameSpaceInfo(_protoInterpreter.getNameSpaceInfo());
+	interpreter.setBaseURI(_protoInterpreter.getBaseURI().asString());
 
-	void MMISessionManager::received(const NewContextResponse& mmiEvent) {
+	MMISession* session;
+
+	if (token.length() > 0) {
+		session = new MMISessionManager::CometMMISession();
+		static_cast<MMISessionManager::CometMMISession*>(session)->_token = token;
+		_tokens[token] = session;
+	} else {
+		// todo handle other cases
+		session = new MMISessionManager::CometMMISession();
 	}
+	session->_interpreter = interpreter;
+
+	// save interpreter
+	_sessions[contextId] = session;
+
+	interpreter.start();
+	interpreter.receive(mmiEvent);
+
+}
 
-	void MMISessionManager::send(const std::string& name, const SendRequest& req) {
-		assert(_sessions.find(name) != _sessions.end());
-		_sessions[name]->send(req);
+void MMISessionManager::received(const NewContextResponse& mmiEvent, const std::string& token) {
+	if (_tokens.find(token) != _tokens.end()) {
+		_tokens.erase(token);
 	}
-	
-	void MMISessionManager::CometMMISession::send(const SendRequest& req) {
-		tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
-		if (!_longPollingReq) {
-			_outQueue.push_back(req);
-			return;
+}
+
+void MMISessionManager::send(const std::string& name, const SendRequest& req) {
+	assert(_sessions.find(name) != _sessions.end());
+	_sessions[name]->send(req);
+}
+
+void MMISessionManager::CometMMISession::send(const SendRequest& req) {
+	tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
+	if (!_longPollingReq) {
+		_outQueue.push_back(req);
+		return;
+	}
+
+	if (req.dom) {
+		std::stringstream ss;
+		Node<std::string> mmiEvent = MMIEvent::getEventNode(req.dom);
+		HTTPServer::Reply reply(_longPollingReq);
+
+		switch (MMIEvent::getType(mmiEvent)) {
+		case MMIEvent::NEWCONTEXTRESPONSE: {
+			NewContextResponse response = NewContextResponse::fromXML(mmiEvent);
+			ss << response.toXML();
+			reply.content = ss.str();
+			break;
 		}
-		
-		if (req.dom) {
-			std::stringstream ss;
-			Node<std::string> mmiEvent = MMIEvent::getEventNode(req.dom);
-			HTTPServer::Reply reply(_longPollingReq);
-			
-			switch (MMIEvent::getType(mmiEvent)) {
-				case MMIEvent::NEWCONTEXTRESPONSE: {
-					NewContextResponse response = NewContextResponse::fromXML(mmiEvent);
-					ss << response.toXML();
-					reply.content = ss.str();
-					break;
-				}
-				case MMIEvent::STARTREQUEST: {
-					StartRequest request = StartRequest::fromXML(mmiEvent);
-					std::cout << mmiEvent << std::endl;
-					ss << request.toXML();
-					reply.content = ss.str();
-					break;
-				}
-				default:
-					break;
-			}
-			reply.headers["Content-Type"] = "application/xml";
-			HTTPServer::reply(reply);
-			_longPollingReq = HTTPServer::Request();
+		case MMIEvent::STARTREQUEST: {
+			StartRequest request = StartRequest::fromXML(mmiEvent);
+			ss << request.toXML();
+			reply.content = ss.str();
+			break;
 		}
-	}
-	
-	void MMISessionManager::CometMMISession::receive(const Arabica::DOM::Node<std::string>& msg) {
-		
-	}
-	
-	void MMISessionManager::CometMMISession::longPoll(const HTTPServer::Request& req) {
-		tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
-		if (_longPollingReq)
-			evhttp_send_error(_longPollingReq.curlReq, 204, NULL);
-		_longPollingReq = req;
-		if (!_outQueue.empty()) {
-			send(_outQueue.front());
-			_outQueue.pop_front();
+		default:
+			break;
 		}
+		reply.headers["Content-Type"] = "application/xml";
+		HTTPServer::reply(reply);
+		_longPollingReq = HTTPServer::Request();
 	}
+}
 
-	boost::shared_ptr<IOProcessorImpl> MMISessionManager::MMIIOProcessor::create(InterpreterImpl* interpreter) {
-		boost::shared_ptr<IOProcessorImpl> ioProc = boost::shared_ptr<IOProcessorImpl>(new MMISessionManager::MMIIOProcessor(_sessionManager));
-		return ioProc;
-	}
-	
-	Data MMISessionManager::MMIIOProcessor::getDataModelVariables() {
-		Data data;
-		return data;
+void MMISessionManager::CometMMISession::receive(const Arabica::DOM::Node<std::string>& msg) {
+
+}
+
+void MMISessionManager::CometMMISession::longPoll(const HTTPServer::Request& req) {
+	tthread::lock_guard<tthread::recursive_mutex> lock(_mutex);
+	if (_longPollingReq)
+		evhttp_send_error(_longPollingReq.curlReq, 204, NULL);
+	_longPollingReq = req;
+	if (!_outQueue.empty()) {
+		send(_outQueue.front());
+		_outQueue.pop_front();
 	}
-	
-	void MMISessionManager::MMIIOProcessor::send(const SendRequest& req) {
-		SendRequest reqCopy(req);
-		
-		if (req.dom) {
-			Arabica::DOM::Node<std::string> mmiEvent = MMIEvent::getEventNode(req.dom);
-			if (!mmiEvent || !mmiEvent.getNodeType() == Node_base::ELEMENT_NODE)
-				return;
-			
-			Arabica::DOM::Element<std::string> mmiElem = Arabica::DOM::Element<std::string>(mmiEvent);
-			switch (MMIEvent::getType(mmiEvent)) {
-				case MMIEvent::STARTRESPONSE:
-				case MMIEvent::PREPARERESPONSE:
-				case MMIEvent::PAUSERESPONSE:
-				case MMIEvent::RESUMERESPONSE:
-				case MMIEvent::CANCELRESPONSE:
-				case MMIEvent::DONENOTIFICATION:
-				case MMIEvent::NEWCONTEXTRESPONSE:
-				case MMIEvent::CLEARCONTEXTRESPONSE:
-				case MMIEvent::STATUSRESPONSE: {
-					// all of the above have a status
-					if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Status")) {
-						mmiElem.setAttributeNS(MMIEvent::nameSpace, "Status", "Success");
-					}
-				}
-				case MMIEvent::PAUSEREQUEST:
-				case MMIEvent::RESUMEREQUEST:
-				case MMIEvent::CANCELREQUEST:
-				case MMIEvent::CLEARCONTEXTREQUEST:
-				case MMIEvent::STATUSREQUEST: {
-					// all of the above have a context
-					if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Context")) {
-						mmiElem.setAttributeNS(MMIEvent::nameSpace, "Context", _interpreter->getName());
-					}
-				}
-				default: {
-					if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Source")) {
-						mmiElem.setAttributeNS(MMIEvent::nameSpace, "Source", _sessionManager->getURL());
-					}
-					if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Target")) {
-						if (boost::starts_with(_interpreter->getCurrentEvent().name, "mmi.")) {
-							mmiElem.setAttributeNS(MMIEvent::nameSpace, "Target", _interpreter->getCurrentEvent().origin);
-						}
-					}
-					if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "RequestID")) {
-						if (boost::starts_with(_interpreter->getCurrentEvent().name, "mmi.")) {
-							mmiElem.setAttributeNS(MMIEvent::nameSpace, "RequestID", _interpreter->getCurrentEvent().sendid);
-						}
-					}
+}
+
+boost::shared_ptr<IOProcessorImpl> MMISessionManager::MMIIOProcessor::create(InterpreterImpl* interpreter) {
+	boost::shared_ptr<IOProcessorImpl> ioProc = boost::shared_ptr<IOProcessorImpl>(new MMISessionManager::MMIIOProcessor(_sessionManager));
+	return ioProc;
+}
+
+Data MMISessionManager::MMIIOProcessor::getDataModelVariables() {
+	Data data;
+	return data;
+}
+
+void MMISessionManager::MMIIOProcessor::send(const SendRequest& req) {
+	SendRequest reqCopy(req);
+
+	if (req.dom) {
+		Arabica::DOM::Node<std::string> mmiEvent = MMIEvent::getEventNode(req.dom);
+		if (!mmiEvent || !mmiEvent.getNodeType() == Node_base::ELEMENT_NODE)
+			return;
+
+		Arabica::DOM::Element<std::string> mmiElem = Arabica::DOM::Element<std::string>(mmiEvent);
+		switch (MMIEvent::getType(mmiEvent)) {
+		case MMIEvent::STARTRESPONSE:
+		case MMIEvent::PREPARERESPONSE:
+		case MMIEvent::PAUSERESPONSE:
+		case MMIEvent::RESUMERESPONSE:
+		case MMIEvent::CANCELRESPONSE:
+		case MMIEvent::DONENOTIFICATION:
+		case MMIEvent::NEWCONTEXTRESPONSE:
+		case MMIEvent::CLEARCONTEXTRESPONSE:
+		case MMIEvent::STATUSRESPONSE: {
+			// all of the above have a status
+			if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Status")) {
+				mmiElem.setAttributeNS(MMIEvent::nameSpace, "Status", "Success");
+			}
+		}
+		case MMIEvent::PAUSEREQUEST:
+		case MMIEvent::RESUMEREQUEST:
+		case MMIEvent::CANCELREQUEST:
+		case MMIEvent::CLEARCONTEXTREQUEST:
+		case MMIEvent::STATUSREQUEST: {
+			// all of the above have a context
+			if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Context")) {
+				mmiElem.setAttributeNS(MMIEvent::nameSpace, "Context", _interpreter->getName());
+			}
+		}
+		default: {
+			if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Source")) {
+				mmiElem.setAttributeNS(MMIEvent::nameSpace, "Source", _sessionManager->getURL());
+			}
+			if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "Target")) {
+				if (boost::starts_with(_interpreter->getCurrentEvent().name, "mmi.")) {
+					mmiElem.setAttributeNS(MMIEvent::nameSpace, "Target", _interpreter->getCurrentEvent().origin);
 				}
 			}
-			
-			if (MMIEvent::getType(mmiEvent) == MMIEvent::EXTENSIONNOTIFICATION && !mmiElem.hasAttribute("Name") && req.name.length() > 0) {
-				mmiElem.setAttribute("Name", req.name);
+			if (!mmiElem.hasAttributeNS(MMIEvent::nameSpace, "RequestID")) {
+				if (boost::starts_with(_interpreter->getCurrentEvent().name, "mmi.")) {
+					mmiElem.setAttributeNS(MMIEvent::nameSpace, "RequestID", _interpreter->getCurrentEvent().sendid);
+				}
 			}
-			// use session mgr to dispatch to session
-			
-			_sessionManager->send(_interpreter->getName(), reqCopy);
 		}
-		
+		}
+
+		if (MMIEvent::getType(mmiEvent) == MMIEvent::EXTENSIONNOTIFICATION && !mmiElem.hasAttribute("Name") && req.name.length() > 0) {
+			mmiElem.setAttribute("Name", req.name);
+		}
+		// use session mgr to dispatch to session
+
+		_sessionManager->send(_interpreter->getName(), reqCopy);
 	}
 
+}
+
 }
\ No newline at end of file
diff --git a/apps/w3c-mmi/im/MMISessionManager.h b/apps/w3c-mmi/im/MMISessionManager.h
index 2ca3d0c..d3b0c48 100644
--- a/apps/w3c-mmi/im/MMISessionManager.h
+++ b/apps/w3c-mmi/im/MMISessionManager.h
@@ -21,7 +21,6 @@ namespace uscxml {
 		
 		class CometMMISession : public MMISession {
 		public:
-			HTTPServer::Request _request;
 			std::deque<SendRequest> _outQueue;
 			HTTPServer::Request _longPollingReq;
 			std::string _token;
@@ -51,7 +50,7 @@ namespace uscxml {
 		void send(const std::string& name, const SendRequest& req);
 
 		/// HTTPServlet
-		void httpRecvRequest(const HTTPServer::Request& req);
+		bool httpRecvRequest(const HTTPServer::Request& req);
 		void setURL(const std::string& url) {
 			_url = url;
 		}
@@ -63,8 +62,9 @@ namespace uscxml {
 		
 	protected:
 		void received(const NewContextRequest& mmiEvent, const std::string& token = "");
-		void received(const NewContextResponse& mmiEvent);
+		void received(const NewContextResponse& mmiEvent, const std::string& token = "");
 		void received(const ExtensionNotification& mmiEvent);
+		void received(const DoneNotification& mmiEvent);
 
 		void setupHTMLClient(const HTTPServer::Request& req);
 		
diff --git a/apps/w3c-mmi/im/uscxml-interaction-manager.cpp b/apps/w3c-mmi/im/uscxml-interaction-manager.cpp
index a7162cc..13189fc 100644
--- a/apps/w3c-mmi/im/uscxml-interaction-manager.cpp
+++ b/apps/w3c-mmi/im/uscxml-interaction-manager.cpp
@@ -169,7 +169,7 @@ int main(int argc, char** argv) {
 
 	// intialize http server on given port
 	HTTPServer::getInstance(port);
-	
+
 	LOG(INFO) << "Processing " << argv[optind];
 	Interpreter protoInterpreter = Interpreter::fromURI(argv[optind]);
 	if (protoInterpreter) {
diff --git a/apps/w3c-mmi/mc/uscxml-modality-component.cpp b/apps/w3c-mmi/mc/uscxml-modality-component.cpp
index afe4e7f..39f81d7 100644
--- a/apps/w3c-mmi/mc/uscxml-modality-component.cpp
+++ b/apps/w3c-mmi/mc/uscxml-modality-component.cpp
@@ -170,7 +170,7 @@ int main(int argc, char** argv) {
 
 	// intialize http server on given port
 	HTTPServer::getInstance(port);
-	
+
 	LOG(INFO) << "Processing " << argv[optind];
 	Interpreter interpreter = Interpreter::fromURI(argv[optind]);
 	if (interpreter) {