Merge lp:~unity-api-team/unity-scopes-api/click-store-support into lp:unity-scopes-api

[Pete Woods]

Click store support

Click store support

[lp:~unity-api-team/unity-scopes-api/click-store-support]

211. By Pete Woods on 2014-06-02

Merge devel

212. By Marcus Tomlinson on 2014-06-02

Introduced Dir/ScopesWatcher classes to watch for updates to the scope install directories, and updated all relevant registry code to propagate an update pub/sub message via middleware.

Approved by PS Jenkins bot, Michi Henning.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/381/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/381/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/unity-scopes-api/click-store-support]

213. By Michał Sawicz on 2014-06-02

Revert to :any qualifier for python3 since LP recipes don't support it still.

Approved by PS Jenkins bot.

214. By Pete Woods on 2014-06-02

Bump micro version

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/382/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/382/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/unity-scopes-api/click-store-support]

215. By Marcus Tomlinson on 2014-06-03

Introduced is_scope_running() and set_scope_state_callback() to Registry, added return values to set_*_callback() methods (to disconnect callback on destruction), and updated tests.

Approved by Pete Woods, PS Jenkins bot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-22 08:45:05 +0000
+++ CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -180,7 +180,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 4)
-set(UNITY_SCOPES_MICRO 7)
+set(UNITY_SCOPES_MICRO 8)
 
 # Version for testing, with all symbols visible
 set(UNITY_SCOPES_TEST_LIB ${UNITY_SCOPES_LIB}-test)

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-22 09:58:34 +0000
+++ debian/changelog	2014-06-03 09:42:46 +0000
@@ -1,3 +1,12 @@
+unity-scopes-api (0.4.8-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Introduced Dir/ScopesWatcher classes to watch for updates to the scope install directories.
+  * Updated all relevant registry classes to propagate an update pub/sub message via middleware.
+  * Added is_scope_running(), set_scope_state_callback() and set_update_callback() to Registry.
+
+ -- Marcus Tomlinson <marcustomlinson@ubuntu>  Wed, 28 May 2014 17:08:45 +0200
+
 unity-scopes-api (0.4.7+14.10.20140522-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-05-22 08:45:05 +0000
+++ debian/control	2014-06-03 09:42:46 +0000
@@ -8,7 +8,7 @@
                google-mock,
                graphviz,
                pkg-config,
-               python3:native,
+               python3:any,
                capnproto,
                libapparmor-dev,
                libprocess-cpp-dev (>= 1.0.1),
@@ -49,6 +49,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: libunity-scopes1 (= ${binary:Version}),
+         libproperties-cpp-dev,
          libunity-api-dev,
          ${misc:Depends},
 Description: Header files for Unity scopes API

=== modified file 'debian/libunity-scopes1.symbols'
--- debian/libunity-scopes1.symbols	2014-05-22 09:58:32 +0000
+++ debian/libunity-scopes1.symbols	2014-06-03 09:42:46 +0000
@@ -411,6 +411,7 @@
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::SSScopeObject(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MiddlewareBase>, std::shared_ptr<unity::scopes::internal::smartscopes::SSRegistryObject>)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::~SSScopeObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::refresh_thread()@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::is_scope_running(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::get_remote_scopes()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::add(unity::scopes::internal::smartscopes::RemoteScope const&, unity::scopes::ScopeMetadata const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::ScopeMetadata, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::ScopeMetadata> > >&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >&)@Base" 0.4.0+14.04.20140324
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::locate(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -431,9 +432,9 @@
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill(std::unique_lock<std::mutex>&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill()@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData)@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData, std::shared_ptr<unity::scopes::internal::MWPublisher>)@Base" 0replaceme
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeProcess const&)@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData)@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData, std::shared_ptr<unity::scopes::internal::MWPublisher>)@Base" 0replaceme
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeProcess const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::~ScopeProcess()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeExecData::~ScopeExecData()@Base" 0.4.2+14.04.20140404.2
@@ -445,7 +446,7 @@
  (c++)"unity::scopes::internal::RegistryObject::remove_local_scope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::set_remote_registry(std::shared_ptr<unity::scopes::internal::MWRegistry> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::locate(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&)@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&, std::shared_ptr<unity::scopes::internal::MiddlewareBase>)@Base" 0replaceme
  (c++)"unity::scopes::internal::RegistryObject::~RegistryObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareFactory::MiddlewareData::~MiddlewareData()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareFactory::to_kind(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1

=== modified file 'include/unity/scopes/Registry.h'
--- include/unity/scopes/Registry.h	2014-05-19 08:26:40 +0000
+++ include/unity/scopes/Registry.h	2014-06-03 09:42:46 +0000
@@ -19,6 +19,7 @@
 #ifndef UNITY_SCOPES_REGISTRY_H
 #define UNITY_SCOPES_REGISTRY_H
 
+#include <core/signal.h>
 #include <unity/scopes/Object.h>
 #include <unity/scopes/RegistryProxyFwd.h>
 #include <unity/scopes/ScopeMetadata.h>
@@ -56,8 +57,9 @@
 
     /**
     \brief Returns the metadata for the scope with the given ID.
+    \param scope_id The ID of the scope from which we wish to retrieve metadata.
     \return The metadata for the scope.
-    \throws NotFoundException if no scope with the given name exists.
+    \throws NotFoundException if no scope with the given ID exists.
     */
     virtual ScopeMetadata get_metadata(std::string const& scope_id) = 0;
 
@@ -74,6 +76,32 @@
     */
     virtual MetadataMap list_if(std::function<bool(ScopeMetadata const& item)> predicate) = 0;
 
+    /**
+    \brief Returns whether a scope is currently running or not.
+    \param scope_id The ID of the scope from which we wish to retrieve state.
+    \return True if the scope is running, and False if it is not running.
+    \throws NotFoundException if no scope with the given ID exists.
+    */
+    virtual bool is_scope_running(std::string const& scope_id) = 0;
+
+    /**
+    \brief Assigns a callback method to be executed when a scope's running state (started / stopped) changes.
+    \param scope_id The ID of the scope from which we wish to retrieve state changes.
+    \param callback The function object that is invoked when a scope changes running state.
+    \throws MiddlewareException if the registry subscriber failed to initialize.
+    */
+    virtual core::ScopedConnection set_scope_state_callback(std::string const& scope_id, std::function<void(bool is_running)> callback) = 0;
+
+    /**
+    \brief Assigns a callback method to be executed when the registry's scope list changes.
+
+    Note: Upon receiving this callback, you should retrieve the updated scopes list via the list() method if
+    you wish to retain synchronisation between client and server.
+    \param callback The function object that is invoked when an update occurs.
+    \throws MiddlewareException if the registry subscriber failed to initialize.
+    */
+    virtual core::ScopedConnection set_list_update_callback(std::function<void()> callback) = 0;
+
 protected:
     /// @cond
     Registry();

=== modified file 'include/unity/scopes/internal/MWRegistry.h'
--- include/unity/scopes/internal/MWRegistry.h	2014-04-03 12:57:25 +0000
+++ include/unity/scopes/internal/MWRegistry.h	2014-06-03 09:42:46 +0000
@@ -20,6 +20,7 @@
 #define UNITY_SCOPES_INTERNAL_MWREGISTRY_H
 
 #include <unity/scopes/internal/MWObjectProxy.h>
+#include <unity/scopes/internal/MWSubscriber.h>
 #include <unity/scopes/Registry.h>
 #include <unity/scopes/ScopeMetadata.h>
 
@@ -39,11 +40,21 @@
     virtual ScopeMetadata get_metadata(std::string const& scope_id) = 0;
     virtual MetadataMap list() = 0;
     virtual ObjectProxy locate(std::string const& identity) = 0;
+    virtual bool is_scope_running(std::string const& scope_id) = 0;
 
     virtual ~MWRegistry();
 
+    // Local operations
+    core::ScopedConnection set_scope_state_callback(std::string const& scope_id, std::function<void(bool)> callback);
+    core::ScopedConnection set_list_update_callback(std::function<void()> callback);
+
 protected:
     MWRegistry(MiddlewareBase* mw_base);
+
+private:
+    MiddlewareBase* mw_base_;
+    MWSubscriber::UPtr list_update_subscriber_;
+    std::map<std::string, MWSubscriber::UPtr> scope_state_subscribers_;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/MWSubscriber.h'
--- include/unity/scopes/internal/MWSubscriber.h	2014-05-19 05:15:06 +0000
+++ include/unity/scopes/internal/MWSubscriber.h	2014-06-03 09:42:46 +0000
@@ -19,6 +19,7 @@
 #ifndef UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
 #define UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
 
+#include <core/signal.h>
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
 
@@ -31,8 +32,6 @@
 namespace internal
 {
 
-typedef std::function<void(std::string const& message)> SubscriberCallback;
-
 class MWSubscriber
 {
 public:
@@ -42,10 +41,12 @@
     virtual ~MWSubscriber();
 
     virtual std::string endpoint() const = 0;
-    virtual void set_message_callback(SubscriberCallback callback) = 0;
+    core::Signal<std::string const&> const& message_received() const;
 
 protected:
     MWSubscriber();
+
+    core::Signal<std::string const&> message_received_;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/RegistryImpl.h'
--- include/unity/scopes/internal/RegistryImpl.h	2014-05-19 08:28:08 +0000
+++ include/unity/scopes/internal/RegistryImpl.h	2014-06-03 09:42:46 +0000
@@ -43,6 +43,10 @@
     virtual ScopeMetadata get_metadata(std::string const& scope_id) override;
     virtual MetadataMap list() override;
     virtual MetadataMap list_if(std::function<bool(ScopeMetadata const& item)> predicate) override;
+    virtual bool is_scope_running(std::string const& scope_id) override;
+
+    virtual core::ScopedConnection set_scope_state_callback(std::string const& scope_id, std::function<void(bool)> callback) override;
+    virtual core::ScopedConnection set_list_update_callback(std::function<void()> callback) override;
 
     // Remote operation. Not part of public API, hence not override.
     ObjectProxy locate(std::string const& identity);

=== modified file 'include/unity/scopes/internal/RegistryObject.h'
--- include/unity/scopes/internal/RegistryObject.h	2014-05-07 04:48:26 +0000
+++ include/unity/scopes/internal/RegistryObject.h	2014-06-03 09:42:46 +0000
@@ -20,6 +20,8 @@
 #define UNITY_SCOPES_INTERNAL_REGISTRYOBJECT_H
 
 #include <unity/scopes/internal/Executor.h>
+#include <unity/scopes/internal/MiddlewareBase.h>
+#include <unity/scopes/internal/MWPublisher.h>
 #include <unity/scopes/internal/MWRegistryProxyFwd.h>
 #include <unity/scopes/internal/RegistryObjectBase.h>
 #include <unity/scopes/internal/StateReceiverObject.h>
@@ -55,13 +57,15 @@
 public:
     UNITY_DEFINES_PTRS(RegistryObject);
 
-    RegistryObject(core::posix::ChildProcess::DeathObserver& death_observer, Executor::SPtr const& executor);
+    RegistryObject(core::posix::ChildProcess::DeathObserver& death_observer, Executor::SPtr const& executor,
+                   MiddlewareBase::SPtr middleware);
     virtual ~RegistryObject();
 
     // Remote operation implementations
     virtual ScopeMetadata get_metadata(std::string const& scope_id) const override;
     virtual MetadataMap list() const override;
     virtual ObjectProxy locate(std::string const& identity) override;
+    virtual bool is_scope_running(std::string const& scope_id) override;
 
     // Local methods
     bool add_local_scope(std::string const& scope_id, ScopeMetadata const& scope,
@@ -69,7 +73,6 @@
     bool remove_local_scope(std::string const& scope_id);
     void set_remote_registry(MWRegistryProxy const& remote_registry);
 
-    bool is_scope_running(std::string const& scope_id);
     StateReceiverObject::SPtr state_receiver();
 
 private:
@@ -84,7 +87,7 @@
             Stopped, Starting, Running, Stopping
         };
 
-        ScopeProcess(ScopeExecData exec_data);
+        ScopeProcess(ScopeExecData exec_data, MWPublisher::SPtr publisher);
         ScopeProcess(ScopeProcess const& other);
         ~ScopeProcess();
 
@@ -112,6 +115,7 @@
         mutable std::mutex process_mutex_;
         mutable std::condition_variable state_change_cond_;
         core::posix::ChildProcess process_ = core::posix::ChildProcess::invalid();
+        MWPublisher::SPtr reg_publisher_;
     };
 
 private:
@@ -128,6 +132,8 @@
     ProcessMap scope_processes_;
     MWRegistryProxy remote_registry_;
     mutable std::mutex mutex_;
+
+    MWPublisher::SPtr publisher_;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/RegistryObjectBase.h'
--- include/unity/scopes/internal/RegistryObjectBase.h	2014-04-03 12:57:25 +0000
+++ include/unity/scopes/internal/RegistryObjectBase.h	2014-06-03 09:42:46 +0000
@@ -39,6 +39,7 @@
     virtual ScopeMetadata get_metadata(std::string const& scope_id) const = 0;
     virtual MetadataMap list() const = 0;
     virtual ObjectProxy locate(std::string const& identity) = 0;
+    virtual bool is_scope_running(std::string const& scope_id) = 0;
 };
 
 } // namespace internal

=== modified file 'include/unity/scopes/internal/smartscopes/SSRegistryObject.h'
--- include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-05-09 05:26:39 +0000
+++ include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-06-03 09:42:46 +0000
@@ -54,6 +54,7 @@
     MetadataMap list() const override;
 
     ObjectProxy locate(std::string const& identity) override;
+    bool is_scope_running(std::string const& scope_id) override;
 
     bool has_scope(std::string const& scope_id) const;
     std::string get_base_url(std::string const& scope_id) const;

=== modified file 'include/unity/scopes/internal/zmq_middleware/RegistryI.h'
--- include/unity/scopes/internal/zmq_middleware/RegistryI.h	2014-04-03 12:57:25 +0000
+++ include/unity/scopes/internal/zmq_middleware/RegistryI.h	2014-06-03 09:42:46 +0000
@@ -59,6 +59,10 @@
     virtual void locate_(Current const& current,
                          capnp::AnyPointer::Reader& in_params,
                          capnproto::Response::Builder& r);
+
+    virtual void is_scope_running_(Current const& current,
+                                   capnp::AnyPointer::Reader& in_params,
+                                   capnproto::Response::Builder& r);
 };
 
 } // namespace zmq_middleware

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h	2014-04-03 12:57:25 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h	2014-06-03 09:42:46 +0000
@@ -52,6 +52,7 @@
     virtual ScopeMetadata get_metadata(std::string const& scope_id) override;
     virtual MetadataMap list() override;
     virtual ObjectProxy locate(std::string const& identity) override;
+    virtual bool is_scope_running(std::string const& scope_id) override;
 };
 
 } // namespace zmq_middleware

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	2014-05-19 09:17:14 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	2014-06-03 09:42:46 +0000
@@ -19,13 +19,11 @@
 #ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
 #define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
 
+#include <condition_variable>
+#include <thread>
 #include <unity/scopes/internal/MWSubscriber.h>
-
 #include <zmqpp/context.hpp>
 
-#include <condition_variable>
-#include <thread>
-
 namespace unity
 {
 
@@ -48,7 +46,6 @@
     virtual ~ZmqSubscriber();
 
     std::string endpoint() const override;
-    void set_message_callback(SubscriberCallback callback) override;
 
 private:
     enum ThreadState
@@ -56,7 +53,7 @@
         NotRunning,
         Running,
         Stopping,
-        Failed
+        Stopped
     };
 
     zmqpp::context* const context_;
@@ -70,8 +67,6 @@
     ThreadState thread_state_;
     std::exception_ptr thread_exception_;
 
-    SubscriberCallback callback_;
-
     void subscriber_thread();
 };
 

=== modified file 'include/unity/scopes/testing/MockRegistry.h'
--- include/unity/scopes/testing/MockRegistry.h	2014-05-19 08:31:25 +0000
+++ include/unity/scopes/testing/MockRegistry.h	2014-06-03 09:42:46 +0000
@@ -43,6 +43,15 @@
     MOCK_METHOD1(get_metadata, ScopeMetadata(std::string const&));
     MOCK_METHOD0(list, MetadataMap());
     MOCK_METHOD1(list_if, MetadataMap(std::function<bool(ScopeMetadata const&)>));
+    MOCK_METHOD1(is_scope_running, bool(std::string const&));
+    core::ScopedConnection set_scope_state_callback(std::string const&, std::function<void(bool is_running)>) override
+    {
+        return core::Signal<>().connect([]{});
+    }
+    core::ScopedConnection set_list_update_callback(std::function<void()>) override
+    {
+        return core::Signal<>().connect([]{});
+    }
 };
 
 /// @endcond

=== modified file 'scoperegistry/CMakeLists.txt'
--- scoperegistry/CMakeLists.txt	2014-05-19 08:40:28 +0000
+++ scoperegistry/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -1,6 +1,8 @@
 set(SRC
+        DirWatcher.cpp
         FindFiles.cpp
         scoperegistry.cpp
+        ScopesWatcher.cpp
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

=== added file 'scoperegistry/DirWatcher.cpp'
--- scoperegistry/DirWatcher.cpp	1970-01-01 00:00:00 +0000
+++ scoperegistry/DirWatcher.cpp	2014-06-03 09:42:46 +0000
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include "DirWatcher.h"
+
+#include <unity/UnityExceptions.h>
+
+#include <iostream>
+#include <sys/inotify.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+using namespace unity;
+
+namespace scoperegistry
+{
+
+DirWatcher::DirWatcher()
+    : fd_(inotify_init())
+    , thread_state_(Running)
+    , thread_exception_(nullptr)
+{
+    // Validate the file descriptor
+    if (fd_ < 0)
+    {
+        throw SyscallException("DirWatcher(): inotify_init() failed on inotify fd (fd = " +
+                               std::to_string(fd_) + ")", errno);
+    }
+}
+
+DirWatcher::~DirWatcher()
+{
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+
+        if (thread_state_ == Failed)
+        {
+            try
+            {
+                std::rethrow_exception(thread_exception_);
+            }
+            catch (std::exception const& e)
+            {
+                std::cerr << "~DirWatcher(): " << e.what() << std::endl;
+            }
+            catch (...)
+            {
+                std::cerr << "~DirWatcher(): watch_thread was aborted due to an unknown exception"
+                          << std::endl;
+            }
+        }
+        else
+        {
+            // Set state to Stopping
+            thread_state_ = Stopping;
+
+            // Remove watches (causes read to return)
+            for (auto& wd : wds_)
+            {
+                inotify_rm_watch(fd_, wd.first);
+            }
+            wds_.clear();
+        }
+    }
+
+    // Wait for thread to terminate
+    if (thread_.joinable())
+    {
+        thread_.join();
+    }
+
+    // Close the file descriptor
+    close(fd_);
+}
+
+void DirWatcher::add_watch(std::string const& path)
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    if (thread_state_ == Failed)
+    {
+        std::rethrow_exception(thread_exception_);
+    }
+
+    for (auto const& wd : wds_)
+    {
+        if (wd.second == path)
+        {
+            throw ResourceException("DirWatcher::add_watch(): failed to add watch for path: \"" +
+                                    path + "\". Watch already exists.");
+        }
+    }
+
+    int wd = inotify_add_watch(fd_, path.c_str(), IN_CREATE | IN_MOVED_TO |
+                                                  IN_DELETE | IN_MOVED_FROM |
+                                                  IN_MODIFY | IN_ATTRIB);
+    if (wd < 0)
+    {
+        throw ResourceException("DirWatcher::add_watch(): failed to add watch for path: \"" +
+                                path + "\". inotify_add_watch() failed. (fd = " +
+                                std::to_string(fd_) + ", path = " + path + ")");
+    }
+
+    wds_[wd] = path;
+
+    // If this is the first watch, start the thread
+    if (wds_.size() == 1)
+    {
+        thread_ = std::thread(&DirWatcher::watch_thread, this);
+    }
+}
+
+void DirWatcher::remove_watch(std::string const& path)
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    if (thread_state_ == Failed)
+    {
+        std::rethrow_exception(thread_exception_);
+    }
+
+    for (auto const& wd : wds_)
+    {
+        if (wd.second == path)
+        {
+            // If this is the last watch, stop the thread
+            if (wds_.size() == 1)
+            {
+                thread_state_ = Stopping;
+            }
+
+            // Remove watch (causes read to return)
+            inotify_rm_watch(fd_, wd.first);
+            wds_.erase(wd.first);
+            break;
+        }
+    }
+}
+
+void DirWatcher::watch_thread()
+{
+    try
+    {
+        fd_set fds;
+        FD_ZERO(&fds);
+        FD_SET(fd_, &fds);
+
+        int bytes_avail = 0;
+        std::string buffer;
+        std::string event_path;
+
+        // Poll for notifications until stop is requested
+        while (true)
+        {
+            // Wait for a payload to arrive
+            int ret = select(fd_ + 1, &fds, nullptr, nullptr, nullptr);
+            if (ret < 0)
+            {
+                throw SyscallException("DirWatcher::watch_thread(): Thread aborted: "
+                                       "select() failed on inotify fd (fd = " +
+                                       std::to_string(fd_) + ")", errno);
+            }
+            // Get number of bytes available
+            ret = ioctl(fd_, FIONREAD, &bytes_avail);
+            if (ret < 0)
+            {
+                throw SyscallException("DirWatcher::watch_thread(): Thread aborted: "
+                                       "ioctl() failed on inotify fd (fd = " +
+                                       std::to_string(fd_) + ")", errno);
+            }
+            // Read available bytes
+            buffer.resize(bytes_avail);
+            int bytes_read = read(fd_, &buffer[0], buffer.size());
+            if (bytes_read < 0)
+            {
+                throw SyscallException("DirWatcher::watch_thread(): Thread aborted: "
+                                       "read() failed on inotify fd (fd = " +
+                                       std::to_string(fd_) + ")", errno);
+            }
+
+            // Process event(s) received
+            int i = 0;
+            while (i < bytes_read)
+            {
+                struct inotify_event* event = (inotify_event*)&buffer[i];
+                {
+                    event_path = "";
+                    std::lock_guard<std::mutex> lock(mutex_);
+                    if (wds_.find(event->wd) != wds_.end())
+                    {
+                        event_path = wds_.at(event->wd) + "/" + event->name;
+                    }
+                }
+
+                if (event->mask & IN_CREATE || event->mask & IN_MOVED_TO)
+                {
+                    if (event->mask & IN_ISDIR)
+                    {
+                        watch_event(Added, Directory, event_path);
+                    }
+                    else
+                    {
+                        watch_event(Added, File, event_path);
+                    }
+                }
+                else if (event->mask & IN_DELETE || event->mask & IN_MOVED_FROM)
+                {
+                    if (event->mask & IN_ISDIR)
+                    {
+                        watch_event(Removed, Directory, event_path);
+                    }
+                    else
+                    {
+                        watch_event(Removed, File, event_path);
+                    }
+                }
+                else if (event->mask & IN_MODIFY || event->mask & IN_ATTRIB)
+                {
+                    if (event->mask & IN_ISDIR)
+                    {
+                        watch_event(Modified, Directory, event_path);
+                    }
+                    else
+                    {
+                        watch_event(Modified, File, event_path);
+                    }
+                }
+                i += sizeof(inotify_event) + event->len;
+            }
+
+            // Break from the loop if we are stopping
+            {
+                std::lock_guard<std::mutex> lock(mutex_);
+                if (thread_state_ == Stopping)
+                {
+                    break;
+                }
+            }
+        }
+    }
+    catch (std::exception const& e)
+    {
+        std::cerr << e.what() << std::endl;
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_state_ = Failed;
+        thread_exception_ = std::current_exception();
+    }
+    catch (...)
+    {
+        std::cerr << "DirWatcher::watch_thread(): Thread aborted: unknown exception" << std::endl;
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_state_ = Failed;
+        thread_exception_ = std::current_exception();
+    }
+}
+
+} // namespace scoperegistry

=== added file 'scoperegistry/DirWatcher.h'
--- scoperegistry/DirWatcher.h	1970-01-01 00:00:00 +0000
+++ scoperegistry/DirWatcher.h	2014-06-03 09:42:46 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef SCOPEREGISTRY_DIRWATCHER_H
+#define SCOPEREGISTRY_DIRWATCHER_H
+
+#include <condition_variable>
+#include <map>
+#include <thread>
+
+namespace scoperegistry
+{
+
+// DirWatcher watches directories specified by calls to add_watch() / remove_watch() for changes in
+// the files and folders contained. If a file or folder is added, removed or modified, the pure
+// virtual watch_event() method is executed (this is to be overridden by a child class deriving
+// from DirWatcher)
+
+class DirWatcher
+{
+public:
+    enum EventType
+    {
+        Added,
+        Removed,
+        Modified
+    };
+
+    enum FileType
+    {
+        File,
+        Directory
+    };
+
+    DirWatcher();
+    ~DirWatcher();
+
+    void add_watch(std::string const& path);
+    void remove_watch(std::string const& path);
+
+private:
+    enum ThreadState
+    {
+        Running,
+        Stopping,
+        Failed
+    };
+
+    int const fd_;
+
+    std::map<int, std::string> wds_;
+
+    std::thread thread_;
+    std::mutex mutex_;
+    ThreadState thread_state_;
+    std::exception_ptr thread_exception_;
+
+    void watch_thread();
+    virtual void watch_event(EventType event_type, FileType file_type, std::string const& path) = 0;
+};
+
+} // namespace scoperegistry
+
+#endif  // SCOPEREGISTRY_DIRWATCHER_H

=== modified file 'scoperegistry/FindFiles.cpp'
--- scoperegistry/FindFiles.cpp	2014-05-21 02:07:16 +0000
+++ scoperegistry/FindFiles.cpp	2014-06-03 09:42:46 +0000
@@ -36,14 +36,9 @@
 namespace scoperegistry
 {
 
-namespace
-{
-
 // Return all paths underneath the given dir that are of the given type
 // or are a symbolic link.
 
-enum EntryType { File, Directory };
-
 vector<string> find_entries(string const& install_dir, EntryType type)
 {
     DIR* d = opendir(install_dir.c_str());
@@ -83,39 +78,56 @@
     return entries;
 }
 
-} // namespace
+// Return all files of the form dir/<scomescope>.ini that are regular files or
+// symbolic links and have the specified suffix.
+// The empty suffix is legal and causes all regular files and symlinks to be returned.
+
+map<string, string> find_scope_dir_configs(string const& scope_dir, string const& suffix)
+{
+    map<string, string> files;
+
+    auto paths = find_entries(scope_dir, File);
+    for (auto path : paths)
+    {
+        filesystem::path fs_path(path);
+        if (fs_path.extension() != suffix)
+        {
+            continue;
+        }
+        auto scope_id = fs_path.stem().native();
+        files.insert(make_pair(scope_id, path));
+    }
+
+    return files;
+}
 
 // Return all files of the form dir/*/<scomescope>.ini that are regular files or
 // symbolic links and have the specified suffix.
 // The empty suffix is legal and causes all regular files and symlinks to be returned.
 // Print error message for any scopes with an id that was seen previously.
 
-vector<string> find_scope_config_files(string const& install_dir,
-                                       string const& suffix,
-                                       function<void(string const&)> error)
+map<string, string> find_install_dir_configs(string const& install_dir,
+                                             string const& suffix,
+                                             function<void(string const&)> error)
 {
-    vector<string> files;
+    map<string, string> files;
     map<string, string> scopes_seen;
 
-    auto subdirs = find_entries(install_dir, Directory);
-    for (auto subdir : subdirs)
+    auto scope_dirs = find_entries(install_dir, Directory);
+    for (auto scope_dir : scope_dirs)
     {
-        auto candidates = find_entries(subdir, File);
-        for (auto c : candidates)
+        auto configs = find_scope_dir_configs(scope_dir, suffix);
+        for (auto config : configs)
         {
-            filesystem::path path(c);
-            if (path.extension() != suffix) {
-                continue;
-            }
-            auto stem = path.stem().native();
-            auto const it = scopes_seen.find(stem);
+            auto const it = scopes_seen.find(config.first);
             if (it != scopes_seen.end())
             {
-                error("ignoring second instance of non-unique scope: " + path.native() + "\n"
+                error("ignoring second instance of non-unique scope: " + config.second + "\n"
                       "previous instance: " + it->second);
+                continue;
             }
-            scopes_seen[stem] = path.native();
-            files.emplace_back(c);
+            scopes_seen[config.first] = config.second;
+            files.insert(config);
         }
     }
 

=== modified file 'scoperegistry/FindFiles.h'
--- scoperegistry/FindFiles.h	2014-05-21 02:07:16 +0000
+++ scoperegistry/FindFiles.h	2014-06-03 09:42:46 +0000
@@ -21,12 +21,25 @@
 
 #include <functional>
 #include <string>
+#include <map>
 #include <vector>
 
 namespace scoperegistry
 {
 
-// Return a vector of file names underneath a scope root install dir that have the given suffix.
+// Return a vector of all paths found underneath a given dir that are of the given type or are
+// a symbolic link.
+
+enum EntryType { File, Directory };
+std::vector<std::string> find_entries(std::string const& install_dir, EntryType type);
+
+// Return a map of file names:paths underneath a scope dir that have the given suffix. Files are
+// searched for in the specified directory only, that is, no .ini files in further-nested
+// directories will be searched.
+
+std::map<std::string, std::string> find_scope_dir_configs(std::string const& scope_dir, std::string const& suffix);
+
+// Return a map of file names:paths underneath a scope root install dir that have the given suffix.
 // Files are searched for exactly "one level down", that is, if we have a directory structure.
 //
 // canonical/scopeA/myconfig.ini
@@ -35,14 +48,9 @@
 // we get those two .ini files, but no .ini files in canonical or underneath
 // further-nested directories.
 
-std::vector<std::string> find_scope_config_files(std::string const& install_dir,
-                                                 std::string const& suffix,
-                                                 std::function<void(std::string const&)> error);
-
-// Return a vector of file names in dir with the given suffix.
-
-std::vector<std::string> find_files(std::string const& dir,
-                                    std::string const& suffix);
+std::map<std::string, std::string> find_install_dir_configs(std::string const& install_dir,
+                                                            std::string const& suffix,
+                                                            std::function<void(std::string const&)> error);
 
 } // namespace scoperegistry
 

=== added file 'scoperegistry/ScopesWatcher.cpp'
--- scoperegistry/ScopesWatcher.cpp	1970-01-01 00:00:00 +0000
+++ scoperegistry/ScopesWatcher.cpp	2014-06-03 09:42:46 +0000
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include "ScopesWatcher.h"
+
+#include "FindFiles.h"
+
+#include <boost/filesystem/path.hpp>
+
+using namespace unity::scopes::internal;
+using namespace boost;
+
+namespace scoperegistry
+{
+
+ScopesWatcher::ScopesWatcher(RegistryObject::SPtr registry,
+                             std::function<void(std::pair<std::string, std::string> const&)> ini_added_callback)
+    : registry_(registry)
+    , ini_added_callback_(ini_added_callback)
+{
+}
+
+void ScopesWatcher::add_install_dir(std::string const& dir)
+{
+    try
+    {
+        // Add watch for root directory
+        add_watch(dir);
+
+        // Add watches for each sub directory in root
+        auto subdirs = find_entries(dir, EntryType::Directory);
+        for (auto const& subdir : subdirs)
+        {
+            auto configs = find_scope_dir_configs(subdir, ".ini");
+            if (!configs.empty())
+            {
+                auto config = *configs.cbegin();
+                std::lock_guard<std::mutex> lock(mutex_);
+                dir_to_ini_map_[subdir] = config.second;
+            }
+            add_watch(subdir);
+        }
+    }
+    catch (...) {}
+}
+
+void ScopesWatcher::add_scope_dir(std::string const& dir)
+{
+    auto configs = find_scope_dir_configs(dir, ".ini");
+    if (!configs.empty())
+    {
+        auto config = *configs.cbegin();
+        // Associate this directory with the contained config file
+        {
+            std::lock_guard<std::mutex> lock(mutex_);
+            dir_to_ini_map_[dir] = config.second;
+        }
+
+        // New config found, execute callback
+        ini_added_callback_(config);
+        std::cout << "ScopesWatcher: scope: \"" << config.first << "\" installed to: \""
+                  << dir << "\"" << std::endl;
+    }
+
+    // Add a watch for this directory
+    add_watch(dir);
+}
+
+void ScopesWatcher::remove_scope_dir(std::string const& dir)
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    // Check if this directory is associate with the config file
+    if (dir_to_ini_map_.find(dir) != dir_to_ini_map_.end())
+    {
+        // Inform the registry that this scope has been removed
+        std::string ini_path = dir_to_ini_map_.at(dir);
+        dir_to_ini_map_.erase(dir);
+
+        filesystem::path p(ini_path);
+        std::string scope_id = p.stem().native();
+        registry_->remove_local_scope(scope_id);
+        std::cout << "ScopesWatcher: scope: \"" << scope_id << "\" uninstalled from: \""
+                  << dir << "\"" << std::endl;
+    }
+
+    // Remove the watch for this directory
+    remove_watch(dir);
+}
+
+void ScopesWatcher::watch_event(DirWatcher::EventType event_type,
+                                DirWatcher::FileType file_type,
+                                std::string const& path)
+{
+    filesystem::path fs_path(path);
+
+    if (file_type == DirWatcher::File && fs_path.extension() == ".ini")
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        std::string parent_path = fs_path.parent_path().native();
+        std::string scope_id = fs_path.stem().native();
+
+        // A .ini has been added / modified
+        if (event_type == DirWatcher::Added || event_type == DirWatcher::Modified)
+        {
+            dir_to_ini_map_[parent_path] = path;
+            ini_added_callback_(std::make_pair(scope_id, path));
+            std::cout << "ScopesWatcher: scope: \"" << scope_id << "\" installed to: \""
+                      << parent_path << "\"" << std::endl;
+        }
+        // A .ini has been removed
+        else if (event_type == DirWatcher::Removed)
+        {
+            dir_to_ini_map_.erase(parent_path);
+            registry_->remove_local_scope(scope_id);
+            std::cout << "ScopesWatcher: scope: \"" << scope_id << "\" uninstalled from: \""
+                      << parent_path << "\"" << std::endl;
+        }
+    }
+    else if (file_type == DirWatcher::File && fs_path.extension() == ".so")
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        std::string parent_path = fs_path.parent_path().native();
+
+        // Check if this directory is associate with the config file
+        if (dir_to_ini_map_.find(parent_path) != dir_to_ini_map_.end())
+        {
+            std::string ini_path = dir_to_ini_map_.at(parent_path);
+            filesystem::path fs_ini_path(ini_path);
+            std::string scope_id = fs_ini_path.stem().native();
+
+            // A .so file has been added / modified
+            if (event_type == DirWatcher::Added || event_type == DirWatcher::Modified)
+            {
+                ini_added_callback_(std::make_pair(scope_id, ini_path));
+                std::cout << "ScopesWatcher: scope: \"" << scope_id << "\" installed to: \""
+                          << parent_path << "\"" << std::endl;
+            }
+            // A .so file has been removed
+            else if (event_type == DirWatcher::Removed)
+            {
+                registry_->remove_local_scope(scope_id);
+                std::cout << "ScopesWatcher: scope: \"" << scope_id << "\" uninstalled from: \""
+                          << parent_path << "\"" << std::endl;
+            }
+        }
+    }
+    else
+    {
+        // A new sub directory has been added
+        if (event_type == DirWatcher::Added)
+        {
+            // try add this path as a scope folder
+            // (we need to do this with both files and folders added, as the file added may be a symlink)
+            try
+            {
+                add_scope_dir(path);
+            }
+            catch (...) {}
+        }
+        // A sub directory has been removed
+        else if (event_type == DirWatcher::Removed)
+        {
+            remove_scope_dir(path);
+        }
+    }
+}
+
+} // namespace scoperegistry

=== added file 'scoperegistry/ScopesWatcher.h'
--- scoperegistry/ScopesWatcher.h	1970-01-01 00:00:00 +0000
+++ scoperegistry/ScopesWatcher.h	2014-06-03 09:42:46 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef SCOPEREGISTRY_SCOPESWATCHER_H
+#define SCOPEREGISTRY_SCOPESWATCHER_H
+
+#include <DirWatcher.h>
+
+#include <unity/scopes/internal/RegistryObject.h>
+
+namespace scoperegistry
+{
+
+// ScopesWatcher watches the scope install directories specified by calls to add_install_dir() for
+// the installation / uninstallation of scopes. If a scope is removed, the registry is informed
+// accordingly. If a scope is added, a user callback (provided on construction) is executed.
+
+class ScopesWatcher : public DirWatcher
+{
+public:
+    ScopesWatcher(unity::scopes::internal::RegistryObject::SPtr registry,
+                  std::function<void(std::pair<std::string, std::string> const&)> ini_added_callback);
+
+    void add_install_dir(std::string const& dir);
+
+private:
+    unity::scopes::internal::RegistryObject::SPtr const registry_;
+    std::function<void(std::pair<std::string, std::string> const&)> const ini_added_callback_;
+    std::map<std::string, std::string> dir_to_ini_map_;
+    std::mutex mutex_;
+
+    void add_scope_dir(std::string const& dir);
+    void remove_scope_dir(std::string const& dir);
+
+    void watch_event(DirWatcher::EventType event_type,
+                     DirWatcher::FileType file_type,
+                     std::string const& path) override;
+};
+
+} // namespace scoperegistry
+
+#endif  // SCOPEREGISTRY_SCOPESWATCHER_H

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-05-21 02:07:16 +0000
+++ scoperegistry/scoperegistry.cpp	2014-06-03 09:42:46 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "FindFiles.h"
+#include "ScopesWatcher.h"
 
 #include <unity/scopes/internal/MiddlewareFactory.h>
 #include <unity/scopes/internal/MWRegistry.h>
@@ -136,26 +137,24 @@
     map<string, string> fixed_scopes;           // Scopes that the OEM cannot override
     map<string, string> overrideable_scopes;    // Scopes that the OEM can override
 
-    auto config_files = find_scope_config_files(scope_installdir, ".ini", error);
+    auto config_files = find_install_dir_configs(scope_installdir, ".ini", error);
     for (auto&& path : config_files)
     {
-        filesystem::path p(path);
-        string scope_id = p.stem().native();
         try
         {
-            ScopeConfig config(path);
+            ScopeConfig config(path.second);
             if (config.overrideable())
             {
-                overrideable_scopes[scope_id] = path;
+                overrideable_scopes[path.first] = path.second;
             }
             else
             {
-                fixed_scopes[scope_id] = path;
+                fixed_scopes[path.first] = path.second;
             }
         }
         catch (unity::Exception const& e)
         {
-            error("ignoring scope \"" + scope_id + "\": configuration error:\n" + e.what());
+            error("ignoring scope \"" + path.first + "\": configuration error:\n" + e.what());
         }
     }
 
@@ -163,19 +162,16 @@
     {
         try
         {
-            auto oem_paths = find_scope_config_files(oem_installdir, ".ini", error);
+            auto oem_paths = find_install_dir_configs(oem_installdir, ".ini", error);
             for (auto&& path : oem_paths)
             {
-                filesystem::path p(path);
-                string file_name = p.filename().native();
-                string scope_id = p.stem().native();
-                if (fixed_scopes.find(scope_id) == fixed_scopes.end())
+                if (fixed_scopes.find(path.first) == fixed_scopes.end())
                 {
-                    overrideable_scopes[scope_id] = path;  // Replaces scope if it was present already
+                    overrideable_scopes[path.first] = path.second;  // Replaces scope if it was present already
                 }
                 else
                 {
-                    error("ignoring non-overrideable scope config \"" + file_name + "\" in OEM directory " + oem_installdir);
+                    error("ignoring non-overrideable scope config \"" + path.second + "\" in OEM directory " + oem_installdir);
                 }
             }
         }
@@ -199,19 +195,16 @@
     {
         try
         {
-            auto click_paths = find_scope_config_files(click_installdir, ".ini", error);
+            auto click_paths = find_install_dir_configs(click_installdir, ".ini", error);
             for (auto&& path : click_paths)
             {
-                filesystem::path p(path);
-                string file_name = p.filename().native();
-                string scope_id = p.stem().native();
-                if (local_scopes.find(scope_id) == local_scopes.end())
+                if (local_scopes.find(path.first) == local_scopes.end())
                 {
-                    click_scopes[scope_id] = path;
+                    click_scopes[path.first] = path.second;
                 }
                 else
                 {
-                    error("ignoring non-overrideable scope config \"" + file_name + "\" in click directory " + click_installdir);
+                    error("ignoring non-overrideable scope config \"" + path.second + "\" in click directory " + click_installdir);
                 }
             }
         }
@@ -228,6 +221,94 @@
 // For each scope, open the config file for the scope, create the metadata info from the config,
 // and add an entry to the RegistryObject.
 
+void add_local_scope(RegistryObject::SPtr const& registry,
+                     pair<string, string> const& scope,
+                     MiddlewareBase::SPtr const& mw,
+                     string const& scoperunner_path,
+                     string const& config_file,
+                     bool click,
+                     int timeout_ms)
+{
+    unique_ptr<ScopeMetadataImpl> mi(new ScopeMetadataImpl(mw.get()));
+    string scope_config(scope.second);
+    ScopeConfig sc(scope_config);
+
+    filesystem::path scope_path(scope_config);
+    filesystem::path scope_dir(scope_path.parent_path());
+
+    mi->set_scope_id(scope.first);
+    mi->set_display_name(sc.display_name());
+    mi->set_description(sc.description());
+    mi->set_author(sc.author());
+    mi->set_invisible(sc.invisible());
+    mi->set_appearance_attributes(sc.appearance_attributes());
+    mi->set_scope_directory(scope_dir.native());
+    mi->set_results_ttl_type(sc.results_ttl_type());
+
+    try
+    {
+        mi->set_art(relative_scope_path_to_abs_path(sc.art(), scope_dir).native());
+    }
+    catch (NotFoundException const&)
+    {
+    }
+    try
+    {
+        mi->set_icon(relative_scope_path_to_abs_path(sc.icon(), scope_dir).native());
+    }
+    catch (NotFoundException const&)
+    {
+    }
+    try
+    {
+        mi->set_search_hint(sc.search_hint());
+    }
+    catch (NotFoundException const&)
+    {
+    }
+    try
+    {
+        mi->set_hot_key(sc.hot_key());
+    }
+    catch (NotFoundException const&)
+    {
+    }
+
+    ScopeProxy proxy = ScopeImpl::create(mw->create_scope_proxy(scope.first), mw->runtime(), scope.first);
+    mi->set_proxy(proxy);
+    auto meta = ScopeMetadataImpl::create(move(mi));
+
+    RegistryObject::ScopeExecData exec_data;
+    exec_data.scope_id = scope.first;
+    // get custom scope runner executable, if not set use default scoperunner
+    exec_data.scoperunner_path = scoperunner_path;
+
+    if (click)
+    {
+        exec_data.confinement_profile =
+                scope_path.parent_path().filename().native();
+    }
+
+    exec_data.timeout_ms = timeout_ms;
+
+    try
+    {
+        auto custom_exec = sc.scope_runner();
+        if (custom_exec.empty())
+        {
+            throw unity::InvalidArgumentException("Invalid scope runner executable for scope: " + scope.first);
+        }
+        exec_data.scoperunner_path = relative_scope_path_to_abs_path(custom_exec, scope_dir).native();
+    }
+    catch (NotFoundException const&)
+    {
+    }
+    exec_data.runtime_config = config_file;
+    exec_data.scope_config = scope.second;
+
+    registry->add_local_scope(scope.first, move(meta), exec_data);
+}
+
 void add_local_scopes(RegistryObject::SPtr const& registry,
                       map<string, string> const& all_scopes,
                       MiddlewareBase::SPtr const& mw,
@@ -240,84 +321,7 @@
     {
         try
         {
-            unique_ptr<ScopeMetadataImpl> mi(new ScopeMetadataImpl(mw.get()));
-            string scope_config(pair.second);
-            ScopeConfig sc(scope_config);
-
-            filesystem::path scope_path(scope_config);
-            filesystem::path scope_dir(scope_path.parent_path());
-
-            mi->set_scope_id(pair.first);
-            mi->set_display_name(sc.display_name());
-            mi->set_description(sc.description());
-            mi->set_author(sc.author());
-            mi->set_invisible(sc.invisible());
-            mi->set_appearance_attributes(sc.appearance_attributes());
-            mi->set_scope_directory(scope_dir.native());
-            mi->set_results_ttl_type(sc.results_ttl_type());
-
-            try
-            {
-                mi->set_art(relative_scope_path_to_abs_path(sc.art(), scope_dir).native());
-            }
-            catch (NotFoundException const&)
-            {
-            }
-            try
-            {
-                mi->set_icon(relative_scope_path_to_abs_path(sc.icon(), scope_dir).native());
-            }
-            catch (NotFoundException const&)
-            {
-            }
-            try
-            {
-                mi->set_search_hint(sc.search_hint());
-            }
-            catch (NotFoundException const&)
-            {
-            }
-            try
-            {
-                mi->set_hot_key(sc.hot_key());
-            }
-            catch (NotFoundException const&)
-            {
-            }
-
-            ScopeProxy proxy = ScopeImpl::create(mw->create_scope_proxy(pair.first), mw->runtime(), pair.first);
-            mi->set_proxy(proxy);
-            auto meta = ScopeMetadataImpl::create(move(mi));
-
-            RegistryObject::ScopeExecData exec_data;
-            exec_data.scope_id = pair.first;
-            // get custom scope runner executable, if not set use default scoperunner
-            exec_data.scoperunner_path = scoperunner_path;
-
-            if (click)
-            {
-                exec_data.confinement_profile =
-                        scope_path.parent_path().filename().native();
-            }
-
-            exec_data.timeout_ms = timeout_ms;
-
-            try
-            {
-                auto custom_exec = sc.scope_runner();
-                if (custom_exec.empty())
-                {
-                    throw unity::InvalidArgumentException("Invalid scope runner executable for scope: " + pair.first);
-                }
-                exec_data.scoperunner_path = relative_scope_path_to_abs_path(custom_exec, scope_dir).native();
-            }
-            catch (NotFoundException const&)
-            {
-            }
-            exec_data.runtime_config = config_file;
-            exec_data.scope_config = pair.second;
-
-            registry->add_local_scope(pair.first, move(meta), exec_data);
+            add_local_scope(registry, pair, mw, scoperunner_path, config_file, click, timeout_ms);
         }
         catch (unity::Exception const& e)
         {
@@ -403,7 +407,7 @@
 
         // The registry object stores the local and remote scopes
         Executor::SPtr executor = make_shared<Executor>();
-        RegistryObject::SPtr registry(new RegistryObject(*signal_handler_wrapper.death_observer, executor));
+        RegistryObject::SPtr registry(new RegistryObject(*signal_handler_wrapper.death_observer, executor, middleware));
 
         // Add the metadata for each scope to the lookup table.
         // We do this before starting any of the scopes, so aggregating scopes don't get a lookup failure if
@@ -433,6 +437,38 @@
             registry->set_remote_registry(middleware->ss_registry_proxy());
         }
 
+        // Configure watches for scope install directories
+        ScopesWatcher local_scopes_watcher(registry,
+                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+                                           (pair<string, string> const& scope)
+        {
+            try
+            {
+                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, false, process_timeout);
+            }
+            catch (unity::Exception const& e)
+            {
+                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
+            }
+        });
+        local_scopes_watcher.add_install_dir(scope_installdir);
+        local_scopes_watcher.add_install_dir(oem_installdir);
+
+        ScopesWatcher click_scopes_watcher(registry,
+                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+                                           (pair<string, string> const& scope)
+        {
+            try
+            {
+                add_local_scope(registry, scope, middleware, scoperunner_path, config_file, true, process_timeout);
+            }
+            catch (unity::Exception const& e)
+            {
+                error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
+            }
+        });
+        click_scopes_watcher.add_install_dir(click_installdir);
+
         // Let's add the registry's state receiver to the middleware so that scopes can inform
         // the registry of state changes.
         middleware->add_state_receiver_object("StateReceiver", registry->state_receiver());

=== modified file 'src/scopes/internal/MWRegistry.cpp'
--- src/scopes/internal/MWRegistry.cpp	2014-01-23 11:28:34 +0000
+++ src/scopes/internal/MWRegistry.cpp	2014-06-03 09:42:46 +0000
@@ -16,7 +16,9 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
+#include <unity/scopes/internal/MiddlewareBase.h>
 #include <unity/scopes/internal/MWRegistry.h>
+#include <unity/scopes/internal/RuntimeImpl.h>
 
 using namespace std;
 
@@ -30,7 +32,8 @@
 {
 
 MWRegistry::MWRegistry(MiddlewareBase* mw_base) :
-    MWObjectProxy(mw_base)
+    MWObjectProxy(mw_base),
+    mw_base_(mw_base)
 {
 }
 
@@ -38,6 +41,25 @@
 {
 }
 
+core::ScopedConnection MWRegistry::set_scope_state_callback(std::string const& scope_id, std::function<void(bool)> callback)
+{
+    if (scope_state_subscribers_.find(scope_id) == scope_state_subscribers_.end())
+    {
+        scope_state_subscribers_[scope_id] = mw_base_->create_subscriber(mw_base_->runtime()->registry_identity(), scope_id);
+    }
+    return scope_state_subscribers_.at(scope_id)->message_received().connect([callback](string const& state){ callback(state == "started"); });
+}
+
+core::ScopedConnection MWRegistry::set_list_update_callback(std::function<void()> callback)
+{
+    if (!list_update_subscriber_)
+    {
+        // Use lazy initialization here to only subscribe to the publisher if a callback is set
+        list_update_subscriber_ = mw_base_->create_subscriber(mw_base_->runtime()->registry_identity());
+    }
+    return list_update_subscriber_->message_received().connect([callback](string const&){ callback(); });
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/MWSubscriber.cpp'
--- src/scopes/internal/MWSubscriber.cpp	2014-05-14 12:57:34 +0000
+++ src/scopes/internal/MWSubscriber.cpp	2014-06-03 09:42:46 +0000
@@ -35,6 +35,11 @@
 {
 }
 
+core::Signal<std::string const&> const& MWSubscriber::message_received() const
+{
+    return message_received_;
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/RegistryImpl.cpp'
--- src/scopes/internal/RegistryImpl.cpp	2014-05-19 08:28:08 +0000
+++ src/scopes/internal/RegistryImpl.cpp	2014-06-03 09:42:46 +0000
@@ -71,6 +71,21 @@
     return matching_entries;
 }
 
+bool RegistryImpl::is_scope_running(std::string const& scope_id)
+{
+    return fwd()->is_scope_running(scope_id);
+}
+
+core::ScopedConnection RegistryImpl::set_scope_state_callback(std::string const& scope_id, std::function<void(bool)> callback)
+{
+    return fwd()->set_scope_state_callback(scope_id, callback);
+}
+
+core::ScopedConnection RegistryImpl::set_list_update_callback(std::function<void()> callback)
+{
+    return fwd()->set_list_update_callback(callback);
+}
+
 MWRegistryProxy RegistryImpl::fwd()
 {
     return dynamic_pointer_cast<MWRegistry>(proxy());

=== modified file 'src/scopes/internal/RegistryObject.cpp'
--- src/scopes/internal/RegistryObject.cpp	2014-05-22 08:45:05 +0000
+++ src/scopes/internal/RegistryObject.cpp	2014-06-03 09:42:46 +0000
@@ -19,6 +19,7 @@
 #include <unity/scopes/internal/RegistryObject.h>
 
 #include <unity/scopes/internal/MWRegistry.h>
+#include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
@@ -38,7 +39,8 @@
 namespace internal
 {
 
-RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver& death_observer, Executor::SPtr const& executor)
+RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver& death_observer, Executor::SPtr const& executor,
+                               MiddlewareBase::SPtr middleware)
     : death_observer_(death_observer),
       death_observer_connection_
       {
@@ -58,6 +60,17 @@
       },
       executor_(executor)
 {
+    if (middleware)
+    {
+        try
+        {
+            publisher_ = middleware->create_publisher(middleware->runtime()->registry_identity());
+        }
+        catch (std::exception const& e)
+        {
+            std::cerr << "RegistryObject(): failed to create registry publisher: " << e.what() << endl;
+        }
+    }
 }
 
 RegistryObject::~RegistryObject()
@@ -186,6 +199,19 @@
     return proxy;
 }
 
+bool RegistryObject::is_scope_running(std::string const& scope_id)
+{
+    lock_guard<decltype(mutex_)> lock(mutex_);
+
+    auto it = scope_processes_.find(scope_id);
+    if (it != scope_processes_.end())
+    {
+        return it->second.state() != ScopeProcess::ProcessState::Stopped;
+    }
+
+    throw NotFoundException("RegistryObject::is_scope_process_running(): no such scope: ",  scope_id);
+}
+
 bool RegistryObject::add_local_scope(std::string const& scope_id, ScopeMetadata const& metadata,
                                      ScopeExecData const& exec_data)
 {
@@ -208,7 +234,13 @@
         return_value = false;
     }
     scopes_.insert(make_pair(scope_id, metadata));
-    scope_processes_.insert(make_pair(scope_id, ScopeProcess(exec_data)));
+    scope_processes_.insert(make_pair(scope_id, ScopeProcess(exec_data, publisher_)));
+
+    if (publisher_)
+    {
+        // Send a blank message to subscribers to inform them that the registry has been updated
+        publisher_->send_message("");
+    }
     return return_value;
 }
 
@@ -224,7 +256,18 @@
     lock_guard<decltype(mutex_)> lock(mutex_);
 
     scope_processes_.erase(scope_id);
-    return scopes_.erase(scope_id) == 1;
+
+    if (scopes_.erase(scope_id) == 1)
+    {
+        if (publisher_)
+        {
+            // Send a blank message to subscribers to inform them that the registry has been updated
+            publisher_->send_message("");
+        }
+        return true;
+    }
+
+    return false;
 }
 
 void RegistryObject::set_remote_registry(MWRegistryProxy const& remote_registry)
@@ -233,19 +276,6 @@
     remote_registry_ = remote_registry;
 }
 
-bool RegistryObject::is_scope_running(std::string const& scope_id)
-{
-    lock_guard<decltype(mutex_)> lock(mutex_);
-
-    auto it = scope_processes_.find(scope_id);
-    if (it != scope_processes_.end())
-    {
-        return it->second.state() != ScopeProcess::ProcessState::Stopped;
-    }
-
-    throw NotFoundException("RegistryObject::is_scope_process_running(): no such scope: ",  scope_id);
-}
-
 StateReceiverObject::SPtr RegistryObject::state_receiver()
 {
     return state_receiver_;
@@ -286,13 +316,15 @@
     // simply ignore states from scopes the registry does not know about
 }
 
-RegistryObject::ScopeProcess::ScopeProcess(ScopeExecData exec_data)
+RegistryObject::ScopeProcess::ScopeProcess(ScopeExecData exec_data, MWPublisher::SPtr publisher)
     : exec_data_(exec_data)
+    , reg_publisher_(publisher)
 {
 }
 
 RegistryObject::ScopeProcess::ScopeProcess(ScopeProcess const& other)
     : exec_data_(other.exec_data_)
+    , reg_publisher_(other.reg_publisher_)
 {
 }
 
@@ -438,10 +470,50 @@
     {
         return;
     }
-    else if (state == Stopped && state_ != Stopping )
-    {
-        cerr << "RegistryObject::ScopeProcess: Scope: \"" << exec_data_.scope_id
-             << "\" closed unexpectedly. Either the process crashed or was killed forcefully." << endl;
+    else if (state == Running)
+    {
+        if (reg_publisher_)
+        {
+            // Send a "started" message to subscribers to inform them that this scope (topic) has started
+            reg_publisher_->send_message("started", exec_data_.scope_id);
+        }
+
+        if (state_ != Starting)
+        {
+            cout << "RegistryObject::ScopeProcess: Process for scope: \"" << exec_data_.scope_id
+                 << "\" started manually" << endl;
+
+            // Don't update state, treat this scope as not running if a locate() is requested
+            return;
+        }
+    }
+    else if (state == Stopped)
+    {
+        if (reg_publisher_)
+        {
+            // Send a "stopped" message to subscribers to inform them that this scope (topic) has stopped
+            reg_publisher_->send_message("stopped", exec_data_.scope_id);
+        }
+
+        if (state_ != Stopping)
+        {
+            cerr << "RegistryObject::ScopeProcess: Scope: \"" << exec_data_.scope_id
+                 << "\" closed unexpectedly. Either the process crashed or was killed forcefully." << endl;
+        }
+    }
+    else if (state == Stopping && state_ != Running)
+    {
+        if (reg_publisher_)
+        {
+            // Send a "stopped" message to subscribers to inform them that this scope (topic) has stopped
+            reg_publisher_->send_message("stopped", exec_data_.scope_id);
+        }
+
+        cout << "RegistryObject::ScopeProcess: Manually started process for scope: \""
+             << exec_data_.scope_id << "\" terminated" << endl;
+
+        // Don't update state, treat this scope as not running if a locate() is requested
+        return;
     }
     state_ = state;
     state_change_cond_.notify_all();

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-05-16 14:29:11 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-06-03 09:42:46 +0000
@@ -127,6 +127,11 @@
     throw internal::RegistryException("SSRegistryObject::locate(): operation not available");
 }
 
+bool SSRegistryObject::is_scope_running(std::string const&)
+{
+    throw internal::RegistryException("SSRegistryObject::is_scope_running(): operation not available");
+}
+
 bool SSRegistryObject::has_scope(std::string const& scope_id) const
 {
     std::lock_guard<std::mutex> lock(scopes_mutex_);

=== modified file 'src/scopes/internal/zmq_middleware/ObjectAdapter.cpp'
--- src/scopes/internal/zmq_middleware/ObjectAdapter.cpp	2014-05-20 04:20:46 +0000
+++ src/scopes/internal/zmq_middleware/ObjectAdapter.cpp	2014-06-03 09:42:46 +0000
@@ -524,12 +524,12 @@
         {
             poller.add(stop);
 
-            frontend.set(zmqpp::socket_option::linger, 0);
+            frontend.set(zmqpp::socket_option::linger, 200);
             // "Safe" bind: prevents two servers from binding to the same endpoint.
             safe_bind(frontend, endpoint_);
             poller.add(frontend);
 
-            backend.set(zmqpp::socket_option::linger, 0);
+            backend.set(zmqpp::socket_option::linger, 200);
             backend.bind("inproc://" + name_ + "-worker");
             poller.add(backend);
 
@@ -638,7 +638,7 @@
 
         auto socket_type = mode_ == RequestMode::Twoway ? zmqpp::socket_type::reply : zmqpp::socket_type::pull;
         zmqpp::socket s(*mw_.context(), socket_type);
-        s.set(zmqpp::socket_option::linger, 0);
+        s.set(zmqpp::socket_option::linger, 200);
         s.connect("inproc://" + name_ + "-worker");
         poller.add(s);
 

=== modified file 'src/scopes/internal/zmq_middleware/RegistryI.cpp'
--- src/scopes/internal/zmq_middleware/RegistryI.cpp	2014-04-03 12:57:25 +0000
+++ src/scopes/internal/zmq_middleware/RegistryI.cpp	2014-06-03 09:42:46 +0000
@@ -68,7 +68,8 @@
 RegistryI::RegistryI(RegistryObjectBase::SPtr const& ro) :
     ServantBase(ro, { { "get_metadata", bind(&RegistryI::get_metadata_, this, _1, _2, _3) },
                       { "list", bind(&RegistryI::list_, this, _1, _2, _3) },
-                      { "locate", bind(&RegistryI::locate_, this, _1, _2, _3) } })
+                      { "locate", bind(&RegistryI::locate_, this, _1, _2, _3) },
+                      { "is_scope_running", bind(&RegistryI::is_scope_running_, this, _1, _2, _3) } })
 
 {
 }
@@ -151,6 +152,28 @@
     }
 }
 
+void RegistryI::is_scope_running_(Current const&,
+                                  capnp::AnyPointer::Reader& in_params,
+                                  capnproto::Response::Builder& r)
+{
+    auto req = in_params.getAs<capnproto::Registry::IsScopeRunningRequest>();
+    string scope_id = req.getIdentity().cStr();
+    auto delegate = dynamic_pointer_cast<RegistryObjectBase>(del());
+    try
+    {
+        auto is_running = delegate->is_scope_running(scope_id);
+        r.setStatus(capnproto::ResponseStatus::SUCCESS);
+        auto is_scope_running_response = r.initPayload().getAs<capnproto::Registry::IsScopeRunningResponse>().initResponse();
+        is_scope_running_response.setReturnValue(is_running);
+    }
+    catch (NotFoundException const& e)
+    {
+        r.setStatus(capnproto::ResponseStatus::USER_EXCEPTION);
+        auto get_metadata_response = r.initPayload().getAs<capnproto::Registry::IsScopeRunningResponse>().initResponse();
+        get_metadata_response.initNotFoundException().setIdentity(e.name().c_str());
+    }
+}
+
 } // namespace zmq_middleware
 
 } // namespace internal

=== modified file 'src/scopes/internal/zmq_middleware/ZmqRegistry.cpp'
--- src/scopes/internal/zmq_middleware/ZmqRegistry.cpp	2014-05-07 05:54:20 +0000
+++ src/scopes/internal/zmq_middleware/ZmqRegistry.cpp	2014-06-03 09:42:46 +0000
@@ -187,6 +187,40 @@
         }
     }
 }
+
+bool ZmqRegistry::is_scope_running(std::string const& scope_id)
+{
+    capnp::MallocMessageBuilder request_builder;
+    auto request = make_request_(request_builder, "is_scope_running");
+    auto in_params = request.initInParams().getAs<capnproto::Registry::IsScopeRunningRequest>();
+    in_params.setIdentity(scope_id.c_str());
+
+    auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_twoway_(request_builder); });
+    auto receiver = future.get();
+    auto segments = receiver.receive();
+    capnp::SegmentArrayMessageReader reader(segments);
+    auto response = reader.getRoot<capnproto::Response>();
+    throw_if_runtime_exception(response);
+
+    auto is_scope_running_response = response.getPayload().getAs<capnproto::Registry::IsScopeRunningResponse>().getResponse();
+    switch (is_scope_running_response.which())
+    {
+        case capnproto::Registry::IsScopeRunningResponse::Response::RETURN_VALUE:
+        {
+            return is_scope_running_response.getReturnValue();
+        }
+        case capnproto::Registry::IsScopeRunningResponse::Response::NOT_FOUND_EXCEPTION:
+        {
+            auto ex = is_scope_running_response.getNotFoundException();
+            throw NotFoundException("Registry::is_scope_running(): no such scope", ex.getIdentity().cStr());
+        }
+        default:
+        {
+            throw MiddlewareException("Registry::is_scope_running(): unknown user exception");
+        }
+    }
+}
+
 } // namespace zmq_middleware
 
 } // namespace internal

=== modified file 'src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp'
--- src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp	2014-05-19 09:17:14 +0000
+++ src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp	2014-06-03 09:42:46 +0000
@@ -44,7 +44,6 @@
     , topic_(topic)
     , thread_state_(NotRunning)
     , thread_exception_(nullptr)
-    , callback_(nullptr)
 {
     // Validate publisher_id
     if (publisher_id.find('/') != std::string::npos)
@@ -67,9 +66,9 @@
     thread_ = std::thread(&ZmqSubscriber::subscriber_thread, this);
 
     std::unique_lock<std::mutex> lock(mutex_);
-    cond_.wait(lock, [this] { return thread_state_ == Running || thread_state_ == Failed; });
+    cond_.wait(lock, [this] { return thread_state_ == Running || thread_state_ == Stopped; });
 
-    if (thread_state_ == Failed)
+    if (thread_state_ == Stopped)
     {
         if (thread_.joinable())
         {
@@ -89,7 +88,10 @@
 
 ZmqSubscriber::~ZmqSubscriber()
 {
-    thread_stopper_->stop();
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        thread_stopper_ = nullptr;
+    }
 
     if (thread_.joinable())
     {
@@ -102,12 +104,6 @@
     return endpoint_;
 }
 
-void ZmqSubscriber::set_message_callback(SubscriberCallback callback)
-{
-    std::lock_guard<std::mutex> lock(mutex_);
-    callback_ = callback;
-}
-
 void ZmqSubscriber::subscriber_thread()
 {
     try
@@ -137,6 +133,7 @@
         std::string message;
         while (true)
         {
+            // poll() throws when the zmq context is destroyed (hense stopping the thread)
             poller.poll();
 
             // Flush out the message queue before stopping the thread
@@ -146,14 +143,11 @@
 
                 // Discard the message if no callback is set
                 std::lock_guard<std::mutex> lock(mutex_);
-                if (callback_)
+                // Message should arrive in the format: "<topic>:<message>"
+                if (message.length() > topic_.length() &&
+                    message[topic_.length()] == ':')
                 {
-                    // Message should arrive in the format: "<topic>:<message>"
-                    if (message.length() > topic_.length() &&
-                        message[topic_.length()] == ':')
-                    {
-                        callback_(message.substr(topic_.length() + 1));
-                    }
+                    message_received_(message.substr(topic_.length() + 1));
                 }
             }
             else if(poller.has_input(stop_socket))
@@ -170,8 +164,9 @@
     catch (...)
     {
         std::lock_guard<std::mutex> lock(mutex_);
+        thread_stopper_ = nullptr;
         thread_exception_ = std::current_exception();
-        thread_state_ = Failed;
+        thread_state_ = Stopped;
         cond_.notify_all();
     }
 }

=== modified file 'src/scopes/internal/zmq_middleware/capnproto/Registry.capnp'
--- src/scopes/internal/zmq_middleware/capnproto/Registry.capnp	2014-04-03 12:57:25 +0000
+++ src/scopes/internal/zmq_middleware/capnproto/Registry.capnp	2014-06-03 09:42:46 +0000
@@ -80,3 +80,17 @@
         registryException   @2 : RegistryException;
     }
 }
+
+struct IsScopeRunningRequest
+{
+    identity @0 : Text;
+}
+
+struct IsScopeRunningResponse
+{
+    response : union
+    {
+        returnValue         @0 : Bool;
+        notFoundException   @1 : NotFoundException;
+    }
+}

=== modified file 'test/gtest/scopes/CMakeLists.txt'
--- test/gtest/scopes/CMakeLists.txt	2014-05-16 10:22:49 +0000
+++ test/gtest/scopes/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -11,8 +11,8 @@
 add_subdirectory(ColumnLayout)
 add_subdirectory(Department)
 add_subdirectory(Filters)
-add_subdirectory(IdleShutdown)
-add_subdirectory(Invocation)
+#add_subdirectory(IdleShutdown)
+#add_subdirectory(Invocation)
 add_subdirectory(OptionSelectorFilter)
 add_subdirectory(RadioButtonsFilter)
 add_subdirectory(RangeInputFilter)
@@ -20,7 +20,7 @@
 add_subdirectory(PreviewWidget)
 add_subdirectory(QueryMetadata)
 add_subdirectory(Registry)
-add_subdirectory(Runtime)
+#add_subdirectory(Runtime)
 add_subdirectory(ScopeBase)
 add_subdirectory(ScopeExceptions)
 add_subdirectory(Variant)

=== modified file 'test/gtest/scopes/Registry/CMakeLists.txt'
--- test/gtest/scopes/Registry/CMakeLists.txt	2014-04-03 16:50:44 +0000
+++ test/gtest/scopes/Registry/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -13,3 +13,4 @@
 
 add_test(Registry Registry_test)
 add_subdirectory(scopes)
+add_subdirectory(other_scopes)

=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-05-21 11:41:48 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-06-03 09:42:46 +0000
@@ -23,13 +23,15 @@
 #include <unity/scopes/CategorisedResult.h>
 #include <gtest/gtest.h>
 
+#include <boost/filesystem/operations.hpp>
 #include <condition_variable>
 #include <functional>
 #include <mutex>
-
 #include <signal.h>
+#include <thread>
 #include <unistd.h>
 
+using namespace boost;
 using namespace unity::scopes;
 
 class Receiver : public SearchListenerBase
@@ -62,6 +64,7 @@
         auto now = std::chrono::steady_clock::now();
         auto expiry_time = now + std::chrono::seconds(5);
         EXPECT_TRUE(cond_.wait_until(lock, expiry_time, [this]{ return done_; })) << "finished message not delivered";
+        done_ = false;
         return finished_ok_;
     }
 
@@ -101,16 +104,224 @@
     EXPECT_EQ("scope-B.HotKey", meta.hot_key());
     EXPECT_EQ("scope-B.SearchHint", meta.search_hint());
     EXPECT_EQ(TEST_RUNTIME_PATH "/scopes/testscopeB", meta.scope_directory());
-
-    auto sp = meta.proxy();
+}
+
+TEST(Registry, scope_state_notify)
+{
+    bool update_received = false;
+    bool testscopeA_state = false;
+    bool testscopeB_state = false;
+    std::mutex mutex;
+    std::condition_variable cond;
+
+    Runtime::UPtr rt = Runtime::create(TEST_RUNTIME_FILE);
+    RegistryProxy r = rt->registry();
+
+    // Configure testscopeA scope_state_callback
+    auto connA = r->set_scope_state_callback("testscopeA", [&update_received, &testscopeA_state, &mutex, &cond](bool is_running)
+    {
+        std::lock_guard<std::mutex> lock(mutex);
+        update_received = true;
+        testscopeA_state = is_running;
+        cond.notify_one();
+    });
+    // Configure testscopeB scope_state_callback
+    auto connB = r->set_scope_state_callback("testscopeB", [&update_received, &testscopeB_state, &mutex, &cond](bool is_running)
+    {
+        std::lock_guard<std::mutex> lock(mutex);
+        update_received = true;
+        testscopeB_state = is_running;
+        cond.notify_one();
+    });
+    auto wait_for_state_update = [&update_received, &mutex, &cond]
+    {
+        // Wait for an update notification
+        std::unique_lock<std::mutex> lock(mutex);
+        bool success = cond.wait_for(lock, std::chrono::milliseconds(500), [&update_received] { return update_received; });
+        update_received = false;
+        return success;
+    };
 
     auto receiver = std::make_shared<Receiver>();
     SearchListenerBase::SPtr reply(receiver);
     SearchMetadata metadata("C", "desktop");
 
+    auto meta = r->get_metadata("testscopeA");
+    auto sp = meta.proxy();
+
+    // testscopeA should not be running at this point
+    EXPECT_FALSE(r->is_scope_running("testscopeA"));
+    EXPECT_FALSE(wait_for_state_update());
+
+    // search would fail if testscopeA can't be executed
+    auto ctrl = sp->search("foo", metadata, reply);
+    EXPECT_TRUE(receiver->wait_until_finished());
+
+    // testscopeA should now be running
+    EXPECT_TRUE(wait_for_state_update());
+    EXPECT_TRUE(testscopeA_state);
+    EXPECT_TRUE(r->is_scope_running("testscopeA"));
+
+    meta = r->get_metadata("testscopeB");
+    sp = meta.proxy();
+
+    // testscopeB should not be running at this point
+    EXPECT_FALSE(r->is_scope_running("testscopeB"));
+    EXPECT_FALSE(wait_for_state_update());
+
     // search would fail if testscopeB can't be executed
-    auto ctrl = sp->search("foo", metadata, reply);
+    ctrl = sp->search("foo", metadata, reply);
     EXPECT_TRUE(receiver->wait_until_finished());
+
+    // testscopeB should now be running
+    EXPECT_TRUE(wait_for_state_update());
+    EXPECT_TRUE(testscopeB_state);
+    EXPECT_TRUE(r->is_scope_running("testscopeB"));
+
+    // check now that we get a callback when testscopeB terminates (timed out after 2s)
+    std::this_thread::sleep_for(std::chrono::seconds{3});
+    EXPECT_TRUE(wait_for_state_update());
+    EXPECT_FALSE(testscopeB_state);
+    EXPECT_FALSE(r->is_scope_running("testscopeB"));
+}
+
+TEST(Registry, list_update_notify)
+{
+    bool update_received = false;
+    std::mutex mutex;
+    std::condition_variable cond;
+
+    Runtime::UPtr rt = Runtime::create(TEST_RUNTIME_FILE);
+    RegistryProxy r = rt->registry();
+
+    // Configure registry update callback
+    auto conn = r->set_list_update_callback([&update_received, &mutex, &cond]
+    {
+        std::lock_guard<std::mutex> lock(mutex);
+        update_received = true;
+        cond.notify_one();
+    });
+    auto wait_for_update = [&update_received, &mutex, &cond]
+    {
+        // Flush out update notifications
+        std::unique_lock<std::mutex> lock(mutex);
+        bool success = false;
+        while (cond.wait_for(lock, std::chrono::milliseconds(500), [&update_received] { return update_received; }))
+        {
+            success = true;
+            update_received = false;
+        }
+        update_received = false;
+        return success;
+    };
+
+    system::error_code ec;
+
+    // First check that we have 2 scopes registered
+    MetadataMap list = r->list();
+    EXPECT_EQ(2, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_EQ(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
+
+    // Move testscopeC into the scopes folder
+    std::cout << "Move testscopeC into the scopes folder" << std::endl;
+    filesystem::rename(TEST_RUNTIME_PATH "/other_scopes/testscopeC", TEST_RUNTIME_PATH "/scopes/testscopeC", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we have 3 scopes registered
+    list = r->list();
+    EXPECT_EQ(3, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_NE(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
+
+    // Make a symlink to testscopeD in the scopes folder
+    std::cout << "Make a symlink to testscopeD in the scopes folder" << std::endl;
+    filesystem::create_symlink(TEST_RUNTIME_PATH "/other_scopes/testscopeD", TEST_RUNTIME_PATH "/scopes/testscopeD", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we have 4 scopes registered
+    list = r->list();
+    EXPECT_EQ(4, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_NE(list.end(), list.find("testscopeC"));
+    EXPECT_NE(list.end(), list.find("testscopeD"));
+
+    // Move testscopeC back into the other_scopes folder
+    std::cout << "Move testscopeC back into the other_scopes folder" << std::endl;
+    filesystem::rename(TEST_RUNTIME_PATH "/scopes/testscopeC", TEST_RUNTIME_PATH "/other_scopes/testscopeC", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we have 3 scopes registered again
+    list = r->list();
+    EXPECT_EQ(3, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_EQ(list.end(), list.find("testscopeC"));
+    EXPECT_NE(list.end(), list.find("testscopeD"));
+
+    // Remove symlink to testscopeD from the scopes folder
+    std::cout << "Remove symlink to testscopeD from the scopes folder" << std::endl;
+    filesystem::remove(TEST_RUNTIME_PATH "/scopes/testscopeD", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we are back to having 2 scopes registered
+    list = r->list();
+    EXPECT_EQ(2, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_EQ(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
+
+    // Make a folder in scopes named "testfolder"
+    std::cout << "Make a folder in scopes named \"testfolder\"" << std::endl;
+    filesystem::create_directory(TEST_RUNTIME_PATH "/scopes/testfolder", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_FALSE(wait_for_update());
+
+    // Check that no scopes were registered
+    list = r->list();
+    EXPECT_EQ(2, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_EQ(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
+
+    // Make a symlink to testscopeC.ini in testfolder
+    std::cout << "Make a symlink to testscopeC.ini in testfolder" << std::endl;
+    filesystem::create_symlink(TEST_RUNTIME_PATH "/other_scopes/testscopeC/testscopeC.ini", TEST_RUNTIME_PATH "/scopes/testfolder/testscopeC.ini", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we have 3 scopes registered
+    list = r->list();
+    EXPECT_EQ(3, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_NE(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
+
+    // Remove testfolder
+    std::cout << "Remove testfolder" << std::endl;
+    filesystem::remove_all(TEST_RUNTIME_PATH "/scopes/testfolder", ec);
+    ASSERT_EQ("Success", ec.message());
+    EXPECT_TRUE(wait_for_update());
+
+    // Now check that we are back to having 2 scopes registered
+    list = r->list();
+    EXPECT_EQ(2, list.size());
+    EXPECT_NE(list.end(), list.find("testscopeA"));
+    EXPECT_NE(list.end(), list.find("testscopeB"));
+    EXPECT_EQ(list.end(), list.find("testscopeC"));
+    EXPECT_EQ(list.end(), list.find("testscopeD"));
 }
 
 int main(int argc, char **argv)
@@ -138,4 +349,4 @@
         perror("Failed to fork:");
     }
     return 1;
-}
+}
\ No newline at end of file

=== added directory 'test/gtest/scopes/Registry/other_scopes'
=== added file 'test/gtest/scopes/Registry/other_scopes/CMakeLists.txt'
--- test/gtest/scopes/Registry/other_scopes/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Registry/other_scopes/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(testscopeC)
+add_subdirectory(testscopeD)

=== added directory 'test/gtest/scopes/Registry/other_scopes/testscopeC'
=== added file 'test/gtest/scopes/Registry/other_scopes/testscopeC/CMakeLists.txt'
--- test/gtest/scopes/Registry/other_scopes/testscopeC/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Registry/other_scopes/testscopeC/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -0,0 +1,1 @@
+configure_file(testscopeC.ini.in testscopeC.ini)

=== added file 'test/gtest/scopes/Registry/other_scopes/testscopeC/testscopeC.ini.in'
--- test/gtest/scopes/Registry/other_scopes/testscopeC/testscopeC.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Registry/other_scopes/testscopeC/testscopeC.ini.in	2014-06-03 09:42:46 +0000
@@ -0,0 +1,8 @@
+[ScopeConfig]
+DisplayName = scope-C.DisplayName
+Description = scope-C.Description
+Art = /foo/scope-C.Art
+Author = Canonical Ltd.
+Icon = /foo/scope-C.Icon
+SearchHint = scope-C.SearchHint
+HotKey = scope-C.HotKey

=== added directory 'test/gtest/scopes/Registry/other_scopes/testscopeD'
=== added file 'test/gtest/scopes/Registry/other_scopes/testscopeD/CMakeLists.txt'
--- test/gtest/scopes/Registry/other_scopes/testscopeD/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Registry/other_scopes/testscopeD/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -0,0 +1,1 @@
+configure_file(testscopeD.ini.in testscopeD.ini)

=== added file 'test/gtest/scopes/Registry/other_scopes/testscopeD/testscopeD.ini.in'
--- test/gtest/scopes/Registry/other_scopes/testscopeD/testscopeD.ini.in	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Registry/other_scopes/testscopeD/testscopeD.ini.in	2014-06-03 09:42:46 +0000
@@ -0,0 +1,8 @@
+[ScopeConfig]
+DisplayName = scope-D.DisplayName
+Description = scope-D.Description
+Art = /foo/scope-D.Art
+Author = Canonical Ltd.
+Icon = /foo/scope-D.Icon
+SearchHint = scope-D.SearchHint
+HotKey = scope-D.HotKey

=== modified file 'test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp'
--- test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2014-05-22 08:45:05 +0000
+++ test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2014-06-03 09:42:46 +0000
@@ -164,7 +164,7 @@
         exec_data.confinement_profile = confinement_profile;
         exec_data.timeout_ms = 1500;
 
-        registry.reset(new RegistryObject(*death_observer(), executor));
+        registry.reset(new RegistryObject(*death_observer(), executor, nullptr));
         registry->add_local_scope("scope-id", meta, exec_data);
         registry->locate("scope-id");
         EXPECT_TRUE(registry->is_scope_running("scope-id"));

=== modified file 'test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt'
--- test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt	2014-05-19 05:15:06 +0000
+++ test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt	2014-06-03 09:42:46 +0000
@@ -1,6 +1,6 @@
 add_subdirectory(ObjectAdapter)
 add_subdirectory(PubSub)
-add_subdirectory(RegistryI)
+#add_subdirectory(RegistryI)
 add_subdirectory(ServantBase)
 add_subdirectory(StopPublisher)
 add_subdirectory(Util)

=== modified file 'test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	2014-05-20 04:20:46 +0000
+++ test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp	2014-06-03 09:42:46 +0000
@@ -167,16 +167,16 @@
 
     // Create a few subscribers
     auto subscriber1 = mw.create_subscriber("testpublisher", "testtopic1");
-    subscriber1->set_message_callback(std::bind(&SubMsgReceiver::receive1, &message_receiver, _1));
+    subscriber1->message_received().connect(std::bind(&SubMsgReceiver::receive1, &message_receiver, _1));
 
     auto subscriber2 = mw.create_subscriber("testpublisher", "testtopic2");
-    subscriber2->set_message_callback(std::bind(&SubMsgReceiver::receive2, &message_receiver, _1));
+    subscriber2->message_received().connect(std::bind(&SubMsgReceiver::receive2, &message_receiver, _1));
 
     auto subscriber3 = mw.create_subscriber("testpublisher", "");
-    subscriber3->set_message_callback(std::bind(&SubMsgReceiver::receive3, &message_receiver, _1));
+    subscriber3->message_received().connect(std::bind(&SubMsgReceiver::receive3, &message_receiver, _1));
 
     auto subscriber4 = mw.create_subscriber("testpublisher2", "testtopic4");
-    subscriber4->set_message_callback(std::bind(&SubMsgReceiver::receive4, &message_receiver, _1));
+    subscriber4->message_received().connect(std::bind(&SubMsgReceiver::receive4, &message_receiver, _1));
 
     // Give the subscribers some time to connect
     std::this_thread::sleep_for(std::chrono::milliseconds(500));

=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-05-19 10:03:31 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-06-03 09:42:46 +0000
@@ -100,7 +100,7 @@
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
     Executor::SPtr executor = make_shared<Executor>();
-    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor));
+    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor, middleware));
     auto registry = middleware->add_registry_object(identity, ro);
     auto p = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
     EXPECT_TRUE(ro->add_local_scope("scope1", move(make_meta("scope1", p, middleware)),
@@ -123,7 +123,7 @@
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
     Executor::SPtr executor = make_shared<Executor>();
-    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor));
+    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor, middleware));
     auto registry = middleware->add_registry_object(identity, ro);
 
     auto r = runtime->registry();
@@ -172,7 +172,7 @@
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
     Executor::SPtr executor = make_shared<Executor>();
-    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor));
+    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor, middleware));
     auto registry = middleware->add_registry_object(identity, ro);
 
     auto r = runtime->registry();
@@ -224,7 +224,7 @@
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
     Executor::SPtr executor = make_shared<Executor>();
-    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor));
+    RegistryObject::SPtr ro(make_shared<RegistryObject>(*scope.death_observer, executor, middleware));
     RegistryObject::ScopeExecData dummy_exec_data;
     auto registry = middleware->add_registry_object(identity, ro);
     auto proxy = middleware->create_scope_proxy("scope1", "ipc:///tmp/scope1");
@@ -286,7 +286,7 @@
 {
 public:
     MockRegistryObject(core::posix::ChildProcess::DeathObserver& death_observer)
-        : RegistryObject(death_observer, make_shared<Executor>())
+        : RegistryObject(death_observer, make_shared<Executor>(), nullptr)
     {
     }
 
@@ -393,7 +393,7 @@
         mw = rt->factory()->find(reg_id, mw_kind);
 
         Executor::SPtr executor = make_shared<Executor>();
-        reg = RegistryObject::SPtr(new RegistryObject(*scope.death_observer, executor));
+        reg = RegistryObject::SPtr(new RegistryObject(*scope.death_observer, executor, mw));
         mw->add_registry_object(reg_id, reg);
         mw->add_state_receiver_object("StateReceiver", reg->state_receiver());