--- a/UnitTests/MessageWithDestination.cpp	Wed Oct 10 17:57:03 2012 +0200
+++ b/UnitTests/MessageWithDestination.cpp	Wed Oct 10 18:20:04 2012 +0200
@@ -1,14 +1,94 @@
 #include "../Core/IDynamicObject.h"
 
+#include "../Core/OrthancException.h"
+
+#include <memory>
+#include <map>
 #include <gtest/gtest.h>
 #include <string>
+#include <boost/thread.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
 
 namespace Orthanc
 {
+  class SharedMessageQueue
+  {
+  private:
+    typedef std::list<IDynamicObject*>  Queue;
+
+    unsigned int maxSize_;
+    Queue queue_;
+    boost::mutex mutex_;
+    boost::condition_variable elementAvailable_;
+
+  public:
+    SharedMessageQueue(unsigned int maxSize = 0)
+    {
+      maxSize_ = maxSize;
+    }
+
+    ~SharedMessageQueue()
+    {
+      for (Queue::iterator it = queue_.begin(); it != queue_.end(); it++)
+      {
+        delete *it;
+      }
+    }
+
+    void Enqueue(IDynamicObject* message)
+    {
+      boost::mutex::scoped_lock lock(mutex_);
+
+      if (maxSize_ != 0 && queue_.size() > maxSize_)
+      {
+        // Too many elements in the queue: First remove the oldest
+        delete queue_.front();
+        queue_.pop_front();
+      }
+
+      queue_.push_back(message);
+      elementAvailable_.notify_one();
+    }
+
+    IDynamicObject* Dequeue(int32_t timeout)
+    {
+      boost::mutex::scoped_lock lock(mutex_);
+
+      // Wait for a message to arrive in the FIFO queue
+      while (queue_.empty())
+      {
+        if (timeout == 0)
+        {
+          elementAvailable_.wait(lock);
+        }
+        else
+        {
+          bool success = elementAvailable_.timed_wait
+            (lock, boost::posix_time::milliseconds(timeout));
+          if (!success)
+          {
+            throw OrthancException(ErrorCode_Timeout);
+          }
+        }
+      }
+
+      std::auto_ptr<IDynamicObject> message(queue_.front());
+      queue_.pop_front();
+
+      return message.release();
+    }
+
+    IDynamicObject* Dequeue()
+    {
+      return Dequeue(0);
+    }
+  };
+
+
   /**
    * This class represents a message that is to be sent to some destination.
    **/
-  class MessageWithDestination : public boost::noncopyable
+  class MessageToDispatch : public boost::noncopyable
   {
   private:
     IDynamicObject* message_;
@@ -20,14 +100,14 @@
      * \param message The content of the message (takes the ownership)
      * \param destination The destination of the message
      **/
-    MessageWithDestination(IDynamicObject* message,
-                           const char* destination)
+    MessageToDispatch(IDynamicObject* message,
+                      const char* destination)
     {
       message_ = message;
       destination_ = destination;
     }
 
-    ~MessageWithDestination()
+    ~MessageToDispatch()
     {
       if (message_)
       {
@@ -35,6 +115,46 @@
       }
     }
   };
+
+
+  class IDestinationContext : public IDynamicObject
+  {
+  public:
+    virtual void Handle(const IDynamicObject& message) = 0;
+  };
+
+
+  class IDestinationContextFactory : public IDynamicObject
+  {
+  public:
+    virtual IDestinationContext* Construct(const char* destination) = 0;
+  };
+
+
+  class MessageDispatcher
+  {
+  private:
+    typedef std::map<std::string, IDestinationContext*>  ActiveContexts;
+
+    std::auto_ptr<IDestinationContextFactory> factory_;
+    ActiveContexts activeContexts_;
+    SharedMessageQueue queue_;
+
+  public:
+    MessageDispatcher(IDestinationContextFactory* factory)  // takes the ownership
+    {
+      factory_.reset(factory);
+    }
+
+    ~MessageDispatcher()
+    {
+      for (ActiveContexts::iterator it = activeContexts_.begin(); 
+           it != activeContexts_.end(); it++)
+      {
+        delete it->second;
+      }
+    }
+  };
 }
 
 
@@ -43,8 +163,8 @@
 
 using namespace Orthanc;
 
-TEST(MessageWithDestination, A)
+TEST(MessageToDispatch, A)
 {
-  MessageWithDestination a(new DicomString("coucou"), "pukkaj");
+  MessageToDispatch a(new DicomString("coucou"), "pukkaj");
 }