See detailled log

- Builds on windows again
- All HTTP requests are no passed into interpreter
- New response element to reply with data
- Moved basichttp URL
- New HTTP servlet invoker to register additional URLs
- More bugfixes than I care to mention

2 files changed, 12 insertions, 12 deletions

diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
index 1e15865..4005d03 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
@@ -77,7 +77,7 @@ void UmundoInvoker::send(const SendRequest& req) {
 							Event event;
 							void* rv = NULL;
 							stub->callStubMethod(req.name, pbMsg, type, rv, "");
-							protobufToData(event, *(const google::protobuf::Message*)rv);
+							protobufToData(event.data, *(const google::protobuf::Message*)rv);
 
 							event.name = _invokeId + ".reply." + req.name;
 							event.origin = msg->getMeta("um.channel");
@@ -162,9 +162,9 @@ void UmundoInvoker::invoke(const InvokeRequest& req) {
 
 	} else if (serviceName.length() > 0) {
 		// use umundo to access services
-		_svcFilter = umundo::ServiceFilter(serviceName);
-		_node->connect(&_svcMgr);
-		_svcMgr.startQuery(_svcFilter, this);
+		_svcFilter = new umundo::ServiceFilter(serviceName);
+		_node->connect(_svcMgr);
+		_svcMgr->startQuery(*_svcFilter, this);
 	}
 }
 
@@ -185,13 +185,13 @@ void UmundoInvoker::receive(void* object, umundo::Message* msg) {
 //    event.compound["class"] = msg->getMeta("um.s11n.type");
 
 	if (object != NULL)
-		protobufToData(event, *(const google::protobuf::Message*)object);
+		protobufToData(event.data, *(const google::protobuf::Message*)object);
 
 	// get meta fields into event
 	std::map<std::string, std::string>::const_iterator metaIter = msg->getMeta().begin();
 	while(metaIter != msg->getMeta().end()) {
 		if (metaIter->first.substr(0,3).compare("um.") != 0)
-			event.compound[metaIter->first] = Data(metaIter->second, Data::VERBATIM);
+			event.data.compound[metaIter->first] = Data(metaIter->second, Data::VERBATIM);
 		metaIter++;
 	}
 
@@ -213,7 +213,7 @@ void UmundoInvoker::added(umundo::ServiceDescription desc) {
 
 	std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
 	while(propIter != desc.getProperties().end()) {
-		addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
+		addedEvent.data.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
 		propIter++;
 	}
 
@@ -239,7 +239,7 @@ void UmundoInvoker::removed(umundo::ServiceDescription desc) {
 
 	std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
 	while(propIter != desc.getProperties().end()) {
-		addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
+		addedEvent.data.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
 		propIter++;
 	}
 
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
index f03006b..a7f45f1 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
@@ -1,12 +1,12 @@
 #ifndef UMUNDOINVOKER_H_77YXQGU7
 #define UMUNDOINVOKER_H_77YXQGU7
 
+#include <uscxml/Interpreter.h>
+#include <google/protobuf/message.h>
 #include <umundo/core.h>
 #include <umundo/s11n.h>
 #include <umundo/rpc.h>
 #include <umundo/s11n/protobuf/PBSerializer.h>
-#include <uscxml/Interpreter.h>
-#include <google/protobuf/message.h>
 
 #ifdef BUILD_AS_PLUGINS
 #include "uscxml/plugins/Plugins.h"
@@ -51,8 +51,8 @@ protected:
 	umundo::TypedPublisher* _pub;
 	umundo::TypedSubscriber* _sub;
 
-	umundo::ServiceFilter _svcFilter;
-	umundo::ServiceManager _svcMgr;
+	umundo::ServiceFilter* _svcFilter;
+	umundo::ServiceManager* _svcMgr;
 	std::map<umundo::ServiceDescription, umundo::ServiceStub*> _svcs;
 
 	static std::multimap<std::string, std::pair<std::string, umundo::Node*> > _nodes;