Merge lp:~michihenning/unity-scopes-api/config-fixes into lp:unity-scopes-api/devel

[Michi Henning]

Phase 1 of the config clean-up.

Summary of changes:

- The Zmq sockets now live in /run/user/<uid>/zmq

- The config files now provide sensible defaults. It's possible to run without any config whatsoever, in which case default values are used for everything.

- scoperegistry, scoperunner, and smartscopesproxy are now installed in /usr/lib/<arch> (instead of a subdir of /usr/lib/arch).

- Many minor clean-ups in the code for better naming, readability, typos, etc.

- Added documentation in CONFIGFILES for the various config parameters. Next step will be to integrate this into the doxygen doc and get rid of this file.

- Added a check to see whether unknown config parameters are present in a config file. That avoids problems due to silly typos, when someone mis-spells a config parameter name and then wonders why it doesn't have any effect.

- Lots of clean-up in the messages produced by the demo scopes, for consistency.

Phase 1 of the config clean-up.

Summary of changes:

- The Zmq sockets now live in /run/user/<uid>/zmq

- The config files now provide sensible defaults. It's possible to run without any config whatsoever, in which case default values are used for everything.

- scoperegistry, scoperunner, and smartscopesproxy are now installed in /usr/lib/<arch> (instead of a subdir of /usr/lib/arch).

- Many minor clean-ups in the code for better naming, readability, typos, etc.

- Added documentation in CONFIGFILES for the various config parameters. Next step will be to integrate this into the doxygen doc and get rid of this file.

- Added a check to see whether unknown config parameters are present in a config file. That avoids problems due to silly typos, when someone mis-spells a config parameter name and then wonders why it doesn't have any effect.

- Lots of clean-up in the messages produced by the demo scopes, for consistency.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Test are failing under CI because XDG_RUNTIME_DIR is not set. The code falls back to /run/user/<euid>, but /run/user doesn't exist, so the Zmq sockets can't be created.

Not sure why there is no /run/user when building under CI. I was under the impression that it should aways be there? It certainly exists on the phone and the desktop without me having to do anything special.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

- scoperegistry, scoperunner, and smartscopesproxy are now installed in /usr/lib/<arch> (instead of a subdir of /usr/lib/arch).

Why this change? There is loads of stuff in the /usr/lib/arch/, we should keep some namespacing - at least a ../arch/unity-scopes/ dir.

77 + The default value is "$XDG_RUNTIME_DIR/<effective UID>/zmq". If XDG_RUNTIME_DIR is not
78 + set, "/run/user/<effective UID>/zmq" is used.

The fallback note seems out-of-date, plus $XDG_RUNTIME_DIR already includes UID.

80 +- EndpointDir.Private (string)

Can you remind you why do we even have this? Scopes will only have access to their own endpoint directory and aggregating scopes (+registry, +dash) need to access them all, so isn't this option obsolete?

111 + The default value is "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scoperunner".
116 + The default value is "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scopes".

Arch-specific binaries can't go into /usr/share/ (and SCOPES_DEFAULT_CONFIGDIR == /usr/share/unity-scopes-api). Moreover the default config files still point to @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/scoperunner/scoperunner and @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-scopes.

121 + by OEMs. The default value is "@CMAKE_INSTALL_PREFIX@/custom/@LIB_INSTALL_PREFIX@/scopes".

Shouldn't this be without the CMAKE_INSTALL_PREFIX prefix? :)

126 + The defaul value is "$HOME/.local/sahre/unity-scopes".

Typos - "defaul", "sahre".

I also noticed Registry.ini's endpoint option disappeared, is it now just Zmq.ini's EndpointDir.Public + "Registry"?

422 - void run_scope(ScopeBase *const scope_base, std::string const& scope_ini_file);
423 + void run_scope(ScopeBase *const scope_base, std::string const& runtime_ini_file, std::string const& scope_ini_file);

:/ Break in public API. How about overload instead?

477 +static constexpr char const* DFLT_SCOPERUNNER_PATH = "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scoperunner";
478..484

Please keep in sync with the default config files.

review: Needs Fixing

[Michi Henning (michihenning)]

Thanks heaps for the thorough review!

> - scoperegistry, scoperunner, and smartscopesproxy are now installed in
> /usr/lib/<arch> (instead of a subdir of /usr/lib/arch).
>
> Why this change? There is loads of stuff in the /usr/lib/arch/, we should keep
> some namespacing - at least a ../arch/unity-scopes/ dir.

I agree. It's /usr/lib/<arch>/unity-scopes now.

> 77 + The default value is "$XDG_RUNTIME_DIR/<effective UID>/zmq". If
> XDG_RUNTIME_DIR is not
> 78 + set, "/run/user/<effective UID>/zmq" is used.
>
> The fallback note seems out-of-date, plus $XDG_RUNTIME_DIR already includes
> UID.

Fixed, thanks!

> 80 +- EndpointDir.Private (string)
>
> Can you remind you why do we even have this? Scopes will only have access to
> their own endpoint directory and aggregating scopes (+registry, +dash) need to
> access them all, so isn't this option obsolete?

That's a hangover from the days where I wasn't sure how we would secure access to the endpoints. I agree, we can hardwire the priv subdir.

Basically, public endpoints go into $XDG_RUNTIME_DIR/zmq, and private ones into $XDG_RUNTIME_DIR/zmq/priv.

Fixed.

> 111 + The default value is
> "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scoperunner".
> 116 + The default value is
> "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scopes".

That's a doc bug, thanks for that! The actual install location is under /usr/lib/<arch>

> Arch-specific binaries can't go into /usr/share/ (and SCOPES_DEFAULT_CONFIGDIR
> == /usr/share/unity-scopes-api). Moreover the default config files still point
> to @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/scoperunner/scoperunner and
> @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-scopes.
>
> 121 + by OEMs. The default value is
> "@CMAKE_INSTALL_PREFIX@/custom/@LIB_INSTALL_PREFIX@/scopes".
>
> Shouldn't this be without the CMAKE_INSTALL_PREFIX prefix? :)
>
> 126 + The defaul value is "$HOME/.local/sahre/unity-scopes".
>
> Typos - "defaul", "sahre".

Fixed.

> I also noticed Registry.ini's endpoint option disappeared, is it now just
> Zmq.ini's EndpointDir.Public + "Registry"?

Yes. There is no point in having a separate config item for this.

> 422 - void run_scope(ScopeBase *const scope_base, std::string const&
> scope_ini_file);
> 423 + void run_scope(ScopeBase *const scope_base, std::string const&
> runtime_ini_file, std::string const& scope_ini_file);
>
> :/ Break in public API. How about overload instead?

Yes, that's better! Fixed, thanks!

> 477 +static constexpr char const* DFLT_SCOPERUNNER_PATH =
> "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/scoperunner";
> 478..484
>
> Please keep in sync with the default config files.

Yes! :-)

There is no need to install any config files now. Everything defaults to something sensible, so I've removed the installation of the config files.

I also removed an inconsistency: we used unity-scopes as a subdir for /usr/lib/<arch>, but unity-scopes-api as a subddir for /usr/share. They are both unity-scopes subdirs now.

[Michal Hruby (mhr3)]

> I also removed an inconsistency: we used unity-scopes as a subdir for
> /usr/lib/<arch>, but unity-scopes-api as a subddir for /usr/share. They are
> both unity-scopes subdirs now.

The unity-scopes directory was used as a scopes install directory though, does that mean it's now both scopes install dir AND location for our internal binaries (registries, runner)? I don't think that's a good idea.

[Michi Henning (michihenning)]

No, all it means is that we now have /usr/share/doc/unity-scopes (instead of /usr/share/doc/unity-scopes-api). And we have /usr/lib/<arch>/unity-scopes, which is consistent with the /usr/share naming.

The scopes are installed in /usr/lib/<arch>/unity-scopes/scopes, so there is a subdirectory for them.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

> No, all it means is that we now have /usr/share/doc/unity-scopes (instead of
> /usr/share/doc/unity-scopes-api). And we have /usr/lib/<arch>/unity-scopes,
> which is consistent with the /usr/share naming.
>
> The scopes are installed in /usr/lib/<arch>/unity-scopes/scopes, so there is a
> subdirectory for them.

In that case I have to NACK that, all the scopes are already installing in /usr/lib/<arch>/unity-scopes/, and we do not want to go over each and every one of them (again!) and change their install location. (same for scopes in /custom).

Otherwise the rest is looking good to me.

review: Needs Fixing

[Michi Henning (michihenning)]

> In that case I have to NACK that, all the scopes are already installing in
> /usr/lib/<arch>/unity-scopes/, and we do not want to go over each and every
> one of them (again!) and change their install location. (same for scopes in
> /custom).

Yes, fair enough, I've changed that.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Together with the few changes made to RegistryObject, I'm happy to approve.

review: Approve

[Michal Hruby (mhr3)]

Alright, gave this a spin on an actual device, first of all, please merge lp:~mhr3/unity-scopes-api/fix-paths so upstart is actually able to run the registries. Next, smart-scopes-proxy doesn't start and is complaining that it can't find its SSRuntime.ini.

It's also odd that we still have the DFLT_RUNTIME_INI, DFLT_REGISTRY_INI etc consts even though they don't point to real files.

Last thing is that we're putting the binaries in .../unity-scopes - imo that dir should be reserved only for scopes. Although it will only ever contain scopes that are controlled by us (and packaged as .debs), so not a big deal.

[Michal Hruby (mhr3)]

review: Needs Fixing

[Michi Henning (michihenning)]

> Alright, gave this a spin on an actual device, first of all, please merge
> lp:~mhr3/unity-scopes-api/fix-paths so upstart is actually able to run the
> registries

Thanks for that! One change:

- boost::filesystem::path path(configfile);
- if (path.extension() != ".ini")
+ if (configfile.find(".ini") == string::npos)

This isn't the same. The new version tests whether configfile *contains* ".ini", not whether it *ends with* ".ini". I've reverted this for the moment because avoiding boost here and doing a suffix test with std::string only is rather messy. (C++ has pretty much the most dysfunctional and unusable string class I've ever come acros...)

> . Next, smart-scopes-proxy doesn't start and is complaining that it
> can't find its SSRuntime.ini.

My apologies for missing that! I was going to do that as part of stage 2, but it looks like that's not possible, so I've added proper config for smartscopesproxy.

> It's also odd that we still have the DFLT_RUNTIME_INI, DFLT_REGISTRY_INI etc
> consts even though they don't point to real files.

The semantics are:

- if an explicit path is provided, use it.

- if no explicit path is provided, try the DFLT path.

  - If that default path exists, use it, otherwise use the hard-wired default values for attributes

That way, we can run without any config files, but can still drop a config file in place if we want to change something.

> Last thing is that we're putting the binaries in .../unity-scopes - imo that
> dir should be reserved only for scopes. Although it will only ever contain
> scopes that are controlled by us (and packaged as .debs), so not a big deal.

Well, I hear you :-) I wasn't happy about the weird path we had: /usr/lib/<arch>/scoperunner/scoperunner.

I don't think it matters that the three binaries are in the same directory as the scopes. We could make a bin subdirectory or some such, though. Would that improve things? (I'm open to either approach.)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Ok, I will re-review the latest changes. (Setting to "Needs Fixing" to remove the "Approve")

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

1447 +// For example, if a config file contains "Smartscopes.Registry.Idenity" instead
1448 +// of "SS.Registry.Identity" (did you spot it?), we print a warning,

This should read: '"Smartscopes.Registry.Idenity" instead of "Smartscopes.Registry.Identity"'

1298 - RuntimeImpl::UPtr reg_rt = RuntimeImpl::create(ss_reg_id, DFLT_SS_RUNTIME_INI);
1299 + RuntimeImpl::UPtr reg_rt = RuntimeImpl::create(ss_reg_id, config_file);

This change breaks the smart scopes proxy. As reg_rt->registry_identity() now returns the identity of the main registry and not the SS registry.

To fix this, smartscopesproxy.cpp line 143: needs to change
from: "reg_mw->add_registry_object(reg_rt->registry_identity(), reg);"
to: "reg_mw->add_registry_object(reg_rt->ss_registry_identity(), reg);"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

> This should read: '"Smartscopes.Registry.Idenity" instead of
> "Smartscopes.Registry.Identity"'
>
> [...]
>
> To fix this, smartscopesproxy.cpp line 143: needs to change
> from: "reg_mw->add_registry_object(reg_rt->registry_identity(), reg);"
> to: "reg_mw->add_registry_object(reg_rt->ss_registry_identity(), reg);"

Thanks heaps for that! I just pushed those changes.

[Michal Hruby (mhr3)]

> > Last thing is that we're putting the binaries in .../unity-scopes - imo that
> > dir should be reserved only for scopes. Although it will only ever contain
> > scopes that are controlled by us (and packaged as .debs), so not a big deal.
>
> Well, I hear you :-) I wasn't happy about the weird path we had:
> /usr/lib/<arch>/scoperunner/scoperunner.
>
> I don't think it matters that the three binaries are in the same directory as
> the scopes. We could make a bin subdirectory or some such, though. Would that
> improve things? (I'm open to either approach.)

Meh, let's keep it the way it is, as I said, no biggie.

Thanks for the other fixes, looks merge-able to me now :)

review: Approve

[Michi Henning (michihenning)]

> > Thanks for the other fixes, looks merge-able to me now :)

Phew, me wiping big beads of sweat off my forehead… ;-)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> Thanks heaps for that! I just pushed those changes.

Ah cool, thanks! Looks good to me too :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/189/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-autolanding/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-autolanding/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-autolanding/13/console

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> FAILED: Autolanding.

ahhhh...

[lp:~michihenning/unity-scopes-api/config-fixes]

319. By Michi Henning on 2014-05-08

Merged devel and resolved conflict.

[Michi Henning (michihenning)]

> ahhhh...

There always is something…

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Another beer…

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-02 13:26:56 +0000
+++ CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -171,18 +171,18 @@
     add_definitions(-DENABLE_IPC_MONITOR)
 endif()
 
-set(SCOPES_DEFAULT_CONFIGDIR ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT})
+# Scopes library name. Also used as a prefix in various places, and as a subdirectory
+# name for installed files. Changing this will also require corresponding changes
+# to the debian files.
+set(UNITY_SCOPES_LIB unity-scopes)
 
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 4)
 set(UNITY_SCOPES_MICRO 4)
 
-# Scopes library
-set(UNITY_SCOPES_LIB unity-scopes)
-
 # Version for testing, with all symbols visible
-set(UNITY_SCOPES_TEST_LIB unity-scopes-test)
+set(UNITY_SCOPES_TEST_LIB ${UNITY_SCOPES_LIB}-test)
 
 pkg_check_modules(JSONCPP jsoncpp REQUIRED)
 
@@ -243,9 +243,10 @@
 
 # Library install prefix
 set(LIB_INSTALL_PREFIX lib/${CMAKE_LIBRARY_ARCHITECTURE})
-
 set(LIBDIR ${CMAKE_INSTALL_LIBDIR})
-set(HDR_INSTALL_DIR include/unity-scopes-${UNITY_SCOPES_MAJOR})
+
+set(LIBSUBDIR ${LIBDIR}/${UNITY_SCOPES_LIB}})
+set(HDR_INSTALL_DIR include/${UNITY_SCOPES_LIB}-${UNITY_SCOPES_MAJOR})
 
 # Tests
 include(CTest)
@@ -344,7 +345,7 @@
 # out all symbols that (recursively) are in the unity::scopes::internal namespace,
 # except for a few exceptions that are needed by the scoperegistry, scoperunner,
 # smartscopesproxy, and any other binaries that reach into the internal namespace.
-set(symbol_map "${CMAKE_SOURCE_DIR}/unity-scopes.map")
+set(symbol_map "${CMAKE_SOURCE_DIR}/${UNITY_SCOPES_LIB}.map")
 set_target_properties(${UNITY_SCOPES_LIB} PROPERTIES
                       LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}")
 set_target_properties(${UNITY_SCOPES_LIB} PROPERTIES LINK_DEPENDS ${symbol_map})
@@ -368,8 +369,6 @@
 
 option(DEVEL_DOCS "Enable detailed Doxygen documentation")
 
-set(CMAKE_INSTALL_DOCDIR doc)
-
 find_package(Doxygen)
 find_program(DOT_EXECUTABLE dot /usr/bin)
 if (NOT DOXYGEN_FOUND OR NOT DOT_EXECUTABLE)
@@ -382,14 +381,14 @@
       configure_file(${PROJECT_SOURCE_DIR}/doc/Doxyfile.in ${PROJECT_BINARY_DIR}/doc/Doxyfile @ONLY IMMEDIATE)
     endif()
     configure_file(${PROJECT_SOURCE_DIR}/doc/index.html ${PROJECT_BINARY_DIR}/doc/index.html COPYONLY)
-    add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/${PROJECT}/index.html
+    add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/doc/${UNITY_SCOPES_LIB}/index.html
                        COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/doc/Doxyfile
                        DEPENDS ${PROJECT_BINARY_DIR}/doc/Doxyfile
                                ${PROJECT_SOURCE_DIR}/doc/tutorial.dox
                                ${UNITY_SCOPES_LIB_SRC}
                                ${UNITY_SCOPES_LIB_HDRS})
     add_custom_target(doc ALL
-                       DEPENDS ${PROJECT_BINARY_DIR}/doc/${PROJECT}/index.html)
-    install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/${PROJECT}
-            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_INSTALL_DOCDIR})
+                       DEPENDS ${PROJECT_BINARY_DIR}/doc/${UNITY_SCOPES_LIB}/index.html)
+    install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/${UNITY_SCOPES_LIB}
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc)
 endif()
 
=== added file 'CONFIGFILES'
--- CONFIGFILES	1970-01-01 00:00:00 +0000
+++ CONFIGFILES	2014-05-08 12:06:13 +0000
@@ -0,0 +1,208 @@
+This document outlines how the scopes run time is configured.
+In general, if a recognized key is not set in a configuration
+file, a default value applies as detailed below.
+
+The following configuration files are used by the scopes run time:
+
+
+Runtime.ini
+-----------
+
+If no specific file is provided to the scopes run time, the default path is
+"/usr/lib/<arch>/unity-scopes/Runtime.ini".
+
+If that file does not exist, the default values apply.
+
+The only recognized group in this file is [Runtime].
+
+The following keys are recognized:
+
+- Registry.Identity (string)
+
+  The identity of the local registry. If not set, the default value is "Registry".
+  To run a scope without a registry, for example, using the scoperunner for testing, the identity
+  can be the empty string.
+
+- Registry.ConfigFile (string)
+
+  The path to the registry configuration file. The default value is
+  "/usr/lib/<arch>/unity-scopes/Registry.ini".
+
+- Smartscopes.Registry.Identity (string)
+
+  The identity of the remote registry. If not set, the default value is "SSRegistry".
+  Setting this value explicitly to the empty string disables use of the remote registry.
+
+- Smartscopes.ConfigFile (string)
+
+  The path to the smartscopes configuration file. The default value is
+  "/usr/lib/<arch>/unity-scopes/Smartscopes.ini".
+
+- Default.Middleware (string)
+
+  The middleware to be used by default. The default value is "Zmq".
+
+- <middleware>.ConfigFile
+
+  The path to the configuration file for the middleware, with the value of
+  Default.Middleware substituted for <middleware>, For example,
+
+  Zmq.ConfigFile = <path>
+
+  The default value is "/usr/lib/<arch>/unity-scopes/Zmq.ini".
+
+
+Zmq.ini
+-------
+
+If no specific file is provided to the scopes run time, the default path is
+"/usr/lib/<arch>/unity-scopes/Zmq.ini".
+
+If that file does not exist, the default values for keys apply.
+
+The only recognized group in this file is [Zmq].
+
+The following keys are recognized:
+
+- EndpointDir (string)
+
+  The directory in which the public endpoint of a scope (or the registry) is created.
+  This endpoint must be accessible to any process.
+
+  The default value is "$XDG_RUNTIME_DIR/zmq". If XDG_RUNTIME_DIR is not
+  set, initialization fails.
+
+  Private endpoints are created in "<EndpointDir.Public>/priv".
+
+
+Registry.ini
+------------
+
+If no specific file is provided to the scopes run time, the default path is
+"/usr/lib/<arch>/unity-scopes/Registry.ini".
+
+If that file does not exist, the default values for keys apply.
+
+The only recognized group in this file is [Registry].
+
+The following keys are recognized:
+
+- Middleware
+
+  The middleware used by the registry, such as "Zmq". The default value is "Zmq".
+
+- <Middleware>.ConfigFile
+
+  <Middleware> must match the value of the Middleware key, for example:
+
+      Zmq.Middleware = path/to/SomeFile.ini
+
+- Scoperunner.Path
+
+  The path to the scoperunner executable. The path must be an absolute path.
+  The default value is "/usr/lib/<arch>/scoperunner".
+
+- Scope.InstallDir
+
+  The directory in which to look for subdirectories containing scope .so and .ini files.
+  The default value is "/usr/lib/<arch>/unity-scopes".
+
+- OEM.InstallDir
+
+  The directory in which to look for subdirectories containing scope .so and .ini files added
+  by OEMs. The default value is "/custom/usr/lib/<arch>/unity-scopes".
+
+- Click.InstallDir
+
+  The directory in which to look for subdirectories containing scopes installed from click packages.
+  The default value is "$HOME/.local/share/unity-scopes".
+
+
+Smartscopes.ini
+--------------
+
+If no specific file is provided to the scopes run time, the default path is
+"/usr/lib/<arch>/unity-scopes/Smartscopes.ini".
+
+If that file does not exist, the default values for keys apply.
+
+The only recognized group in this file is [Smartscopes].
+
+The following keys are recognized:
+
+- Http.Reply.Timeout
+
+  The amount of time (in seconds) to wait for a reply from the smartscopes server.
+
+- Registry.Refresh.Rate
+
+  The amount of time (in seconds) between a metadata refresh from the smartscopes server.
+
+- Registry.Refresh.Fail.Timeout
+
+  The amount of time (in seconds) in between retry attempts if a metadata refresh from
+  the smartscopes server fails.
+
+- Scope.Identity
+
+  The identity for proxy scope provided by smartscopesproxy.
+  The default value is "SmartScope".
+
+
+<scope_id>.ini
+--------------
+
+The recognized groups in this file are:
+
+- ScopeConfig
+- Appearance
+
+The following keys are recognized in the ScopeConfig group:
+
+- Override
+
+  Determines whether an OEM scope is allowed to override a Canonical scope. This key is used only by Canonical
+  scopes. If true, the Canonical scope can be replaced by an OEM scope with the same ID. The default value
+  is false.
+
+  For OEM scopes and click scopes, the setting of this key is ignored.
+
+- DisplayName
+
+  The display name of a scope (mandatory, localizable).
+
+- Description
+
+  The description of a scope (mandatory, localizable).
+
+- Author
+
+  The author of the scope (mandatory).
+
+- Art
+
+  Artwork to be shown for the scope. The default value is the empty string.
+
+- Icon
+
+  The icon to be shown for the scope. The default value is the empty string.
+
+- SearchHint
+
+  A search hint for on-screen display (localizable). The default value is the empty string.
+
+- HotKey
+
+  The hot key for the scope. The default value is the empty string.
+
+- Invisible
+
+  Whether the scope is hidden in the UI. The default value is false.
+
+- ScopeRunner
+
+  The path to a custom scoperunner binary. If not set, the default scoperunner is used.
+
+The following keys are recognized in the Appearance group:
+
+- TODO: document this
 
=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-05-06 11:32:05 +0000
+++ RELEASE_NOTES.md	2014-05-08 12:06:13 +0000
@@ -3,8 +3,19 @@
 
 Changes in version 0.4.4
 ========================
-  * The register_annotation() method of SearchReply is now deprecated - push(Annotation const&) should be used instead.
-    The display order of annotations with respect to results and categories got updated in the documentation of that method.
+  - The register_annotation() method of SearchReply is now deprecated - push(Annotation const&) should
+    be used instead. The display order of annotations with respect to results and categories
+    got updated in the documentation of that method.
+
+  - Simplified configuration with sensible defaults for all values.
+
+  - scoperunner, scoperegistry, and smartscopesproxy are now install in /usr/lib/<arch>
+    (instead of in a subdirectory of <arch>).
+
+  - Runtime::run_scope() now has an overload to accept a path to Runtime.ini. If no file name is passed,
+    the system-wide Runtime.ini is used.
+
+  - UNIX domain sockets for Zmq are now placed under /user/run/<uid>/zmq by default.
 
 Changes in version 0.4.2
 ========================
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-03-06 10:55:17 +0000
+++ data/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -2,14 +2,6 @@
 configure_file(lib${UNITY_SCOPES_LIB}.pc.in lib${UNITY_SCOPES_LIB}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_SCOPES_LIB}.pc DESTINATION ${LIB_INSTALL_PREFIX}/pkgconfig)
 
-# scope framework config files
-configure_file(Runtime.ini.in Runtime.ini @ONLY)
-configure_file(Registry.ini.in Registry.ini @ONLY)
-configure_file(Zmq.ini.in Zmq.ini @ONLY)
-configure_file(SSRuntime.ini.in SSRuntime.ini @ONLY)
-configure_file(SSRegistry.ini.in SSRegistry.ini @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini ${CMAKE_CURRENT_BINARY_DIR}/Registry.ini ${CMAKE_CURRENT_BINARY_DIR}/SSRuntime.ini ${CMAKE_CURRENT_BINARY_DIR}/SSRegistry.ini ${CMAKE_CURRENT_BINARY_DIR}/Zmq.ini DESTINATION ${SCOPES_DEFAULT_CONFIGDIR})
-
 # upstart job for smart scopes proxy
 configure_file(smart-scopes-proxy.conf.in smart-scopes-proxy.conf @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smart-scopes-proxy.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
@@ -21,6 +13,6 @@
 # Empty directory for scopes to put their conf files into
 # If we start install our own conf files here, this can be
 # removed (installing files implicitly creates the subdirs)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unity-scopes)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unity-scopes
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB})
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB}
 DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
=== removed file 'data/Registry.ini.in'
--- data/Registry.ini.in	2014-03-06 10:55:17 +0000
+++ data/Registry.ini.in	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Registry]
-Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/Registry
-Zmq.EndpointDir = /tmp
-Zmq.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Zmq.ini
-Scope.InstallDir = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-scopes
-OEM.InstallDir = /custom/lib/@CMAKE_LIBRARY_ARCHITECTURE@/unity-scopes
-Scoperunner.Path = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/scoperunner/scoperunner
-SS.Registry.Identity = SSRegistry
-SS.Registry.Endpoint = ipc:///tmp/SSRegistry
 
=== removed file 'data/Runtime.ini.in'
--- data/Runtime.ini.in	2013-12-13 11:25:44 +0000
+++ data/Runtime.ini.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[Runtime]
-Registry.Identity = Registry
-Registry.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Registry.ini
-Default.Middleware = Zmq
-Zmq.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Zmq.ini
 
=== removed file 'data/SSRegistry.ini.in'
--- data/SSRegistry.ini.in	2014-03-06 10:55:17 +0000
+++ data/SSRegistry.ini.in	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[Registry]
-Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/SSRegistry
-Zmq.EndpointDir = /tmp
-Zmq.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Zmq.ini
-Scope.InstallDir = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-scopes
-Scoperunner.Path = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/scoperunner/scoperunner
 
=== removed file 'data/SSRuntime.ini.in'
--- data/SSRuntime.ini.in	2014-02-04 13:57:56 +0000
+++ data/SSRuntime.ini.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[Runtime]
-Registry.Identity = SSRegistry
-Registry.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/SSRegistry.ini
-Default.Middleware = Zmq
-Zmq.ConfigFile = @CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Zmq.ini
 
=== removed file 'data/Zmq.ini.in'
--- data/Zmq.ini.in	2013-11-29 12:20:25 +0000
+++ data/Zmq.ini.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
 
=== modified file 'data/libunity-scopes.pc.in'
--- data/libunity-scopes.pc.in	2014-03-06 10:58:11 +0000
+++ data/libunity-scopes.pc.in	2014-05-08 12:06:13 +0000
@@ -19,7 +19,9 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 includedir=${prefix}/@HDR_INSTALL_DIR@
 libdir=${prefix}/@LIBDIR@
-scopesdir=${libdir}/unity-scopes
+scopesdir=${libdir}/@UNITY_SCOPES_LIB@
+scoperegistry_bin=${libdir}/@UNITY_SCOPES_LIB@/scoperegistry
+scoperunner_bin=${libdir}/@UNITY_SCOPES_LIB@/scoperunner
 
 Name: lib@UNITY_SCOPES_LIB@
 Description: Unity Scopes API library
 
=== modified file 'data/scope-registry.conf.in'
--- data/scope-registry.conf.in	2014-02-12 10:21:41 +0000
+++ data/scope-registry.conf.in	2014-05-08 12:06:13 +0000
@@ -7,4 +7,4 @@
 respawn
 respawn limit 10 60
 
-exec @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/scoperegistry/scoperegistry
+exec @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@UNITY_SCOPES_LIB@/scoperegistry
 
=== modified file 'data/smart-scopes-proxy.conf.in'
--- data/smart-scopes-proxy.conf.in	2014-03-06 14:05:06 +0000
+++ data/smart-scopes-proxy.conf.in	2014-05-08 12:06:13 +0000
@@ -9,4 +9,4 @@
 
 expect stop
 
-exec @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/smartscopesproxy/smartscopesproxy upstart
+exec @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@UNITY_SCOPES_LIB@/smartscopesproxy upstart
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-05-02 13:26:56 +0000
+++ debian/changelog	2014-05-08 12:06:13 +0000
@@ -1,10 +1,31 @@
 unity-scopes-api (0.4.4-0ubuntu1) UNRELEASED; urgency=low
 
-  * Implemented to_uri() and from_uri() conversions for CannedQuery.
-  * Ship scopes-client in libunity-scopes-cli package.
+  [ Michi Henning ]
+  * Simplified configuration files.
+  * Removed SS.Registry.Endpoint from Runtime.ini.
+  * Replaced SS.Registry.Identity with Smartscopes.Registry.Identity
+  * Added documentation for configuration parameters (see CONFIGFILES in
+    the root of the source tree)
+  * Runtime::run_scope() now has an overload to accept a path to Runtime.ini.
+    If no file name is passed, the system-wide Runtime.ini is used.
+  * UNIX domain sockets for Zmq are now placed under $XDG_RUNTIME_DIR/zmq.
+  * Install location for things under /usr/share is now unity-scopes instead
+    of unity-scopes-api.
+
+  [ Pawel Stolowski ]
   * Renamed SearchReply::register_annotation() to push().
 
- -- Pawel Stolowski <[e-mail]>  Tue, 29 Apr 2014 13:39:03 +0200
+ -- Michi Henning <[e-mail]>  Thu, 01 May 2014 13:55:48 +1000
+
+unity-scopes-api (0.4.3+14.10.20140502.1-0ubuntu1) utopic; urgency=low
+
+  [ Tarmac ]
+  * Sync with devel branch.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 02 May 2014 14:44:05 +0000
 
 unity-scopes-api (0.4.3+14.10.20140428-0ubuntu1) utopic; urgency=low
 
 
=== modified file 'debian/libunity-scopes-doc.install'
--- debian/libunity-scopes-doc.install	2014-02-04 09:50:11 +0000
+++ debian/libunity-scopes-doc.install	2014-05-08 12:06:13 +0000
@@ -1,1 +1,1 @@
-usr/share/doc/unity-scopes-api/*
+usr/share/doc/unity-scopes/*
 
=== modified file 'debian/libunity-scopes1.install'
--- debian/libunity-scopes1.install	2014-04-03 15:04:11 +0000
+++ debian/libunity-scopes1.install	2014-05-08 12:06:13 +0000
@@ -1,7 +1,6 @@
 usr/lib/*/libunity-scopes.so.*
 usr/lib/*/unity-scopes
-usr/lib/*/scoperegistry/*
-usr/lib/*/scoperunner/*
-usr/lib/*/smartscopesproxy/*
-usr/share/unity-scopes-api/*.ini
+usr/lib/*/unity-scopes/scoperegistry
+usr/lib/*/unity-scopes/scoperunner
+usr/lib/*/unity-scopes/smartscopesproxy
 usr/share/upstart/sessions/*.conf
 
=== modified file 'debian/libunity-scopes1.symbols'
--- debian/libunity-scopes1.symbols	2014-05-06 11:25:36 +0000
+++ debian/libunity-scopes1.symbols	2014-05-08 12:06:13 +0000
@@ -283,7 +283,8 @@
  (c++)"unity::scopes::Runtime::create_scope_runtime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140324
  (c++)"unity::scopes::Runtime::create(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::destroy()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::Runtime::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::Runtime::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::Runtime::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::Runtime::Runtime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::~Runtime()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::deserialize_json(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.3+14.10.20140428
@@ -366,7 +367,8 @@
  (c++)"unity::scopes::Registry::~Registry()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::create(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::destroy()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeImpl::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::RuntimeImpl::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeImpl::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeImpl::RuntimeImpl(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::~RuntimeImpl()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -395,14 +397,14 @@
  (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
- (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSRegistryObject(std::shared_ptr<unity::scopes::internal::MiddlewareBase>, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSRegistryObject(std::shared_ptr<unity::scopes::internal::MiddlewareBase>, unity::scopes::internal::smartscopes::SSConfig const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::~SSRegistryObject()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeConfig::RUNTIME_CONFIG_GROUP@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::SSConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::~SSConfig()@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeConfig::RuntimeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeConfig::~RuntimeConfig()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::MiddlewareBase::MiddlewareBase(unity::scopes::internal::RuntimeImpl*)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareBase::~MiddlewareBase()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::REGISTRY_CONFIG_GROUP@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::RegistryConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::~RegistryConfig()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::update_state(unity::scopes::internal::RegistryObject::ScopeProcess::ProcessState)@Base" 0.4.2+14.04.20140404.2
@@ -605,16 +607,15 @@
  (c++)"unity::scopes::Category::title() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Category::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::async_pool() const@Base" 0.4.3+14.10.20140428
- (c++)"unity::scopes::internal::RuntimeImpl::configfile() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::RuntimeImpl::ss_configfile() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeImpl::registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::registry_identity() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::registry_configfile() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeImpl::registry_endpointdir() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::RuntimeImpl::ss_registry_identity() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeImpl::factory() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::registry() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::scope_id() const@Base" 0.4.0+14.04.20140312.1
@@ -637,21 +638,23 @@
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::get_ssclient() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::list() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::has_scope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::scope_identity() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::reg_refresh_rate() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::http_reply_timeout() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::smartscopes::SSConfig::reg_refresh_fail_timeout() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeConfig::ss_configfile() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeConfig::registry_identity() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeConfig::default_middleware() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeConfig::registry_configfile() const@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::RuntimeConfig::ss_registry_identity() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeConfig::default_middleware_configfile() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::MiddlewareBase::runtime() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::endpointdir() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::mw_configfile() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::oem_installdir() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RegistryConfig::scope_installdir() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::scoperunner_path() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::ss_registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::ss_registry_identity() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::mw_kind() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::endpoint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::identity() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::wait_for_state(unity::scopes::internal::RegistryObject::ScopeProcess::ProcessState, int) const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::wait_for_state(std::unique_lock<std::mutex>&, unity::scopes::internal::RegistryObject::ScopeProcess::ProcessState, int) const@Base" 0.4.2+14.04.20140404.2
 
=== modified file 'demo/CMakeLists.txt'
--- demo/CMakeLists.txt	2014-04-23 11:04:31 +0000
+++ demo/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -4,7 +4,6 @@
 
 configure_file(Runtime.ini.in Runtime.ini)
 configure_file(Registry.ini.in Registry.ini)
-configure_file(Zmq.ini.in Zmq.ini)
 
 add_definitions(-DDEMO_RUNTIME_PATH="${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini")
 
 
=== modified file 'demo/README'
--- demo/README	2014-04-23 11:04:31 +0000
+++ demo/README	2014-05-08 12:06:13 +0000
@@ -32,4 +32,4 @@
 $ ./scopes-client scope-B testquery
 
 The client currently looks for Runtime.ini in the current directory and if not present, uses the system-wide Runtime.ini
-shipped with libunity-scopes (/usr/share/unity-scopes-api/Runtime.ini by default)
+shipped with libunity-scopes (/usr/lib/<arch>/unity-scopes/Runtime.ini by default)
 
=== modified file 'demo/Registry.ini.in'
--- demo/Registry.ini.in	2014-02-13 02:40:08 +0000
+++ demo/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,10 +1,5 @@
 [Registry]
-Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/Registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
 Scope.InstallDir = @CMAKE_CURRENT_BINARY_DIR@/scopes
 OEM.InstallDir = /custom/usr/lib/@CMAKE_LIBRARY_ARCHITECTURE@/unity/scopes
 Scoperunner.Path = @CMAKE_BINARY_DIR@/scoperunner/scoperunner
-SS.Registry.Identity = SSRegistry
-SS.Registry.Endpoint = ipc:///tmp/SSRegistry
 
=== modified file 'demo/Runtime.ini.in'
--- demo/Runtime.ini.in	2014-01-31 02:21:24 +0000
+++ demo/Runtime.ini.in	2014-05-08 12:06:13 +0000
@@ -1,5 +1,3 @@
 [Runtime]
 Registry.Identity = Registry
 Registry.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Registry.ini
-Default.Middleware = Zmq
-Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
 
=== removed file 'demo/Zmq.ini.in'
--- demo/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ demo/Zmq.ini.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
 
=== modified file 'demo/click/scope-click/CMakeLists.txt'
--- demo/click/scope-click/CMakeLists.txt	2014-04-03 15:27:11 +0000
+++ demo/click/scope-click/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -6,7 +6,7 @@
     include(GNUInstallDirs)
     include(FindPkgConfig)
 
-    pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.4.0)
+    pkg_check_modules(UNITY_SCOPES REQUIRED lib${UNITY_SCOPES_LIB}>=0.4.0)
     add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
     add_definitions(-std=c++11)
 
=== modified file 'demo/stand-alone/CMakeLists.txt'
--- demo/stand-alone/CMakeLists.txt	2014-02-03 09:04:04 +0000
+++ demo/stand-alone/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -1,5 +1,4 @@
 configure_file(Runtime.ini.in Runtime.ini)
-configure_file(Zmq.ini.in Zmq.ini)
 
 add_executable(stand-alone-client stand-alone-client.cpp)
 
 
=== modified file 'demo/stand-alone/Runtime.ini.in'
--- demo/stand-alone/Runtime.ini.in	2014-02-03 09:04:04 +0000
+++ demo/stand-alone/Runtime.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,1 @@
 [Runtime]
-Default.Middleware = Zmq
-Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
 
=== removed file 'demo/stand-alone/Zmq.ini.in'
--- demo/stand-alone/Zmq.ini.in	2014-02-03 09:04:04 +0000
+++ demo/stand-alone/Zmq.ini.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
 
=== modified file 'doc/Doxyfile-devel.in'
--- doc/Doxyfile-devel.in	2014-02-26 00:34:09 +0000
+++ doc/Doxyfile-devel.in	2014-05-08 12:06:13 +0000
@@ -888,7 +888,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = @PROJECT@
+HTML_OUTPUT            = @UNITY_SCOPES_LIB@
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 
=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2014-05-01 17:25:23 +0000
+++ doc/Doxyfile.in	2014-05-08 12:06:13 +0000
@@ -887,7 +887,7 @@
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = @PROJECT@
+HTML_OUTPUT            = @UNITY_SCOPES_LIB@
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 
=== modified file 'doc/index.html'
--- doc/index.html	2014-02-26 10:43:45 +0000
+++ doc/index.html	2014-05-08 12:06:13 +0000
@@ -1,10 +1,10 @@
 <head> 
-<meta http-equiv="refresh" content="1;url=unity-scopes-api/index.html"> 
+<meta http-equiv="refresh" content="1;url=unity-scopes/index.html"> 
 <script type="text/javascript">
-    window.location.href = "unity-scopes-api/index.html"
+    window.location.href = "unity-scopes/index.html"
 </script>
 <title>Unity Scopes API - Page Redirection</title>
 </head> 
 <body> 
-<p>You will be redirected automatically, otherwise please <a href="unity-scopes-api/index.html">click here</a>.</p> 
+<p>You will be redirected automatically, otherwise please <a href="unity-scopes/index.html">click here</a>.</p> 
 </body> 
 
=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2014-01-31 07:55:00 +0000
+++ include/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -1,13 +1,13 @@
 add_subdirectory(unity)
 set(UNITY_SCOPES_LIB_HDRS ${UNITY_SCOPES_LIB_HDRS} ${headers} PARENT_SCOPE)
 
-add_custom_command(OUTPUT unity-scopes.h
+add_custom_command(OUTPUT ${UNITY_SCOPES_LIB}.h
 COMMAND ${CMAKE_SOURCE_DIR}/tools/create_globalheader.py
-${CMAKE_CURRENT_BINARY_DIR}/unity-scopes.h ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB}.h ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
 DEPENDS ${UNITY_SCOPES_LIB_HDRS})
 
 add_custom_target(globalheader ALL
-DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/unity-scopes.h)
+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB}.h)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-scopes.h
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${UNITY_SCOPES_LIB}.h
 DESTINATION ${HDR_INSTALL_DIR})
 
=== modified file 'include/unity/scopes/Runtime.h'
--- include/unity/scopes/Runtime.h	2014-04-03 16:46:00 +0000
+++ include/unity/scopes/Runtime.h	2014-05-08 12:06:13 +0000
@@ -102,8 +102,17 @@
     This method is intended to run a scope that can not be loaded via the scope runner, such as those written in languages that can not be dynamically loaded.
 
     \param scope_base The scope implementation
+    \param runtime_ini_file The full path of runtime configuration file. Passing an empty string uses
+           a default configuration.
     \param scope_ini_file The full path of scope configuration file
     */
+    void run_scope(ScopeBase *const scope_base, std::string const& runtime_ini_file, std::string const& scope_ini_file);
+
+    /**
+    \brief Run a scope without going through the scope runner.
+
+    Equivalent to `run_scope(scope_base, "", scope_ini_file);`
+    */
     void run_scope(ScopeBase *const scope_base, std::string const& scope_ini_file);
 
     // TODO: Flesh out documentation for this, especially syntax.
 
=== modified file 'include/unity/scopes/internal/ConfigBase.h'
--- include/unity/scopes/internal/ConfigBase.h	2014-02-26 11:32:43 +0000
+++ include/unity/scopes/internal/ConfigBase.h	2014-05-08 12:06:13 +0000
@@ -21,6 +21,9 @@
 
 #include <unity/util/IniParser.h>
 
+#include <map>
+#include <set>
+
 namespace unity
 {
 
@@ -39,16 +42,23 @@
 {
 public:
     ConfigBase();
-    ConfigBase(std::string const& configfile);
+    ConfigBase(std::string const& configfile, std::string const& dflt_file = "");
     virtual ~ConfigBase();
 
     unity::util::IniParser::SPtr parser() const;
 
     virtual std::string get_string(std::string const& group, std::string const& key) const;
-    virtual std::string get_optional_string(std::string const& group, std::string const& key) const;
+    virtual std::string get_optional_string(std::string const& group,
+                                            std::string const& key,
+                                            std::string const& dflt = "") const;
     virtual std::string get_middleware(std::string const& group, std::string const& key) const;
 
-    virtual void throw_ex(::std::string const& reason) const;
+protected:
+    void throw_ex(::std::string const& reason) const;
+    bool path_exists(::std::string const& path) const;
+
+    typedef std::map<std::string, std::set<std::string>> KnownEntries;
+    void check_unknown_entries(KnownEntries const& valid) const;
 
 private:
     unity::util::IniParser::SPtr parser_;
 
=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2014-02-06 05:03:24 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2014-05-08 12:06:13 +0000
@@ -28,9 +28,23 @@
 namespace internal
 {
 
-static constexpr const char* DFLT_RUNTIME_INI = "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Runtime.ini";
-static constexpr const char* DFLT_SS_RUNTIME_INI = "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/SSRuntime.ini";
-static constexpr const char* DFLT_REGISTRY_INI = "@CMAKE_INSTALL_PREFIX@/@SCOPES_DEFAULT_CONFIGDIR@/Registry.ini";
+static constexpr const char* DFLT_RUNTIME_INI = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@/Runtime.ini";
+static constexpr const char* DFLT_REGISTRY_INI = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@/Registry.ini";
+static constexpr char const* DFLT_REGISTRY_ID = "Registry";
+static constexpr const char* DFLT_SS_INI = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@/Smartscopes.ini";
+static constexpr char const* DFLT_SS_REGISTRY_ID = "SSRegistry";
+static constexpr char const* DFLT_SCOPERUNNER_PATH = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@/scoperunner";
+static constexpr char const* DFLT_MIDDLEWARE = "Zmq";
+static constexpr char const* DFLT_ZMQ_MIDDLEWARE_INI = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@/Zmq.ini";
+static constexpr char const* DFLT_MIDDLEWARE_INI = DFLT_ZMQ_MIDDLEWARE_INI;
+static constexpr char const* DFLT_SCOPE_INSTALL_DIR = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
+static constexpr char const* DFLT_OEM_INSTALL_DIR = "/custom/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
+
+static constexpr int DFLT_SS_HTTP_TIMEOUT = 20;              // seconds
+static constexpr int DFLT_SS_REG_REFRESH_RATE = 86400;       // 24 hours as seconds
+static constexpr int DFLT_SS_REG_REFRESH_FAIL_TIMEOUT = 10;  // seconds
+
+static constexpr char const* DFLT_SS_SCOPE_IDENTITY = "SmartScope";
 
 } // namespace internal
 
 
=== modified file 'include/unity/scopes/internal/MiddlewareBase.h'
--- include/unity/scopes/internal/MiddlewareBase.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/MiddlewareBase.h	2014-05-08 12:06:13 +0000
@@ -65,7 +65,9 @@
     virtual ObjectProxy string_to_proxy(std::string const& s) = 0;
     virtual std::string proxy_to_string(MWProxy const& proxy) = 0;
 
-    virtual MWRegistryProxy create_registry_proxy(std::string const& identity, std::string const& endpoint) = 0;
+    virtual MWRegistryProxy registry_proxy() = 0;
+    virtual MWRegistryProxy ss_registry_proxy() = 0;
+
     virtual MWScopeProxy create_scope_proxy(std::string const& identity) = 0;
     virtual MWScopeProxy create_scope_proxy(std::string const& identity, std::string const& endpoint) = 0;
     virtual MWQueryProxy create_query_proxy(std::string const& identity, std::string const& endpoint) = 0;
 
=== modified file 'include/unity/scopes/internal/RegistryConfig.h'
--- include/unity/scopes/internal/RegistryConfig.h	2014-04-04 13:22:38 +0000
+++ include/unity/scopes/internal/RegistryConfig.h	2014-05-08 12:06:13 +0000
@@ -33,35 +33,25 @@
 class RegistryConfig : public ConfigBase
 {
 public:
-    static constexpr char const* REGISTRY_CONFIG_GROUP = "Registry";
-
     RegistryConfig(std::string const& identity, std::string const& configfile);
     ~RegistryConfig();
 
     std::string identity() const;
     std::string mw_kind() const;
-    std::string endpointdir() const;
-    std::string endpoint() const;
     std::string mw_configfile() const;
     std::string scope_installdir() const;       // Directory for Canonical scopes
     std::string oem_installdir() const;         // Directory for OEM scope config files
     std::string click_installdir() const;       // Directory for Click scope config files
     std::string scoperunner_path() const;       // Path to scoperunner binary
-    std::string ss_registry_identity() const;   // Identity of smart scopes registry
-    std::string ss_registry_endpoint() const;   // Endpoint of smart scopes registry
 
 private:
     std::string identity_;
     std::string mw_kind_;
-    std::string endpointdir_;
-    std::string endpoint_;
     std::string mw_configfile_;
     std::string scope_installdir_;
     std::string oem_installdir_;
     std::string click_installdir_;
     std::string scoperunner_path_;
-    std::string ss_registry_identity_;
-    std::string ss_registry_endpoint_;
 };
 
 } // namespace internal
 
=== modified file 'include/unity/scopes/internal/RegistryObject.h'
--- include/unity/scopes/internal/RegistryObject.h	2014-04-10 10:59:00 +0000
+++ include/unity/scopes/internal/RegistryObject.h	2014-05-08 12:06:13 +0000
@@ -123,10 +123,11 @@
 
     Executor::SPtr executor_;
 
-    mutable std::mutex mutex_;
     MetadataMap scopes_;
-    std::map<std::string, ScopeProcess> scope_processes_;
+    typedef std::map<std::string, ScopeProcess> ProcessMap;
+    ProcessMap scope_processes_;
     MWRegistryProxy remote_registry_;
+    mutable std::mutex mutex_;
 };
 
 } // namespace internal
 
=== modified file 'include/unity/scopes/internal/RuntimeConfig.h'
--- include/unity/scopes/internal/RuntimeConfig.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/RuntimeConfig.h	2014-05-08 12:06:13 +0000
@@ -34,19 +34,21 @@
 class RuntimeConfig : public ConfigBase
 {
 public:
-    static const char* RUNTIME_CONFIG_GROUP;
-
     RuntimeConfig(std::string const& configfile);
     ~RuntimeConfig();
 
     std::string registry_identity() const;
     std::string registry_configfile() const;
+    std::string ss_registry_identity() const;
+    std::string ss_configfile() const;
     std::string default_middleware() const;
     std::string default_middleware_configfile() const;
 
 private:
     std::string registry_identity_;
     std::string registry_configfile_;
+    std::string ss_registry_identity_;
+    std::string ss_configfile_;
     std::string default_middleware_;
     std::string default_middleware_configfile_;
 };
 
=== modified file 'include/unity/scopes/internal/RuntimeImpl.h'
--- include/unity/scopes/internal/RuntimeImpl.h	2014-04-15 05:24:45 +0000
+++ include/unity/scopes/internal/RuntimeImpl.h	2014-05-08 12:06:13 +0000
@@ -44,17 +44,17 @@
     void destroy();
 
     std::string scope_id() const;
-    std::string configfile() const;
     MiddlewareFactory const* factory() const;
     RegistryProxy registry() const;
     std::string registry_configfile() const;
     std::string registry_identity() const;
-    std::string registry_endpointdir() const;
-    std::string registry_endpoint() const;
+    std::string ss_configfile() const;
+    std::string ss_registry_identity() const;
     Reaper::SPtr reply_reaper() const;
     ThreadPool::SPtr async_pool() const;
     ThreadSafeQueue<std::future<void>>::SPtr future_queue() const;
-    void run_scope(ScopeBase *const scope_base, std::string const &scope_ini_file);
+    void run_scope(ScopeBase* const scope_base, std::string const& scope_ini_file);
+    void run_scope(ScopeBase* const scope_base, std::string const& runtime_ini_file, std::string const& scope_ini_file);
 
     ObjectProxy string_to_proxy(std::string const& s) const;
     std::string proxy_to_string(ObjectProxy const& proxy) const;
@@ -67,14 +67,13 @@
 
     bool destroyed_;
     std::string scope_id_;
-    std::string configfile_;
     MiddlewareFactory::UPtr middleware_factory_;
     MiddlewareBase::SPtr middleware_;
     mutable RegistryProxy registry_;
     mutable std::string registry_configfile_;
     mutable std::string registry_identity_;
-    mutable std::string registry_endpointdir_;
-    mutable std::string registry_endpoint_;
+    mutable std::string ss_configfile_;
+    mutable std::string ss_registry_identity_;
     mutable Reaper::SPtr reply_reaper_;
     mutable ThreadPool::SPtr async_pool_;  // Pool of invocation threads for async query creation
     mutable ThreadSafeQueue<std::future<void>>::SPtr future_queue_;
 
=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
--- include/unity/scopes/internal/ScopeConfig.h	2014-04-08 08:26:44 +0000
+++ include/unity/scopes/internal/ScopeConfig.h	2014-05-08 12:06:13 +0000
@@ -35,9 +35,6 @@
 class ScopeConfig : public ConfigBase
 {
 public:
-    static constexpr const char* SCOPE_CONFIG_GROUP = "ScopeConfig";
-    static constexpr const char* SCOPE_DISPLAY_GROUP = "Appearance";
-
     ScopeConfig(std::string const& configfile);
     ~ScopeConfig();
 
@@ -51,6 +48,7 @@
     std::string hot_key() const;         // Optional, throws NotFoundException if not present
     bool invisible() const;              // Optional, returns false if not present
     std::string scope_runner() const;    // Optional, throws NotFoundException if not present
+
     VariantMap appearance_attributes() const; // Optional, return empty map if no attributes are present
 
 private:
@@ -62,7 +60,7 @@
     std::unique_ptr<std::string> icon_;
     std::unique_ptr<std::string> search_hint_;
     std::unique_ptr<std::string> hot_key_;
-    std::unique_ptr<bool> invisible_;
+    bool invisible_;
     std::unique_ptr<std::string> scope_runner_;
     VariantMap appearance_attributes_;
 };
 
=== added file 'include/unity/scopes/internal/smartscopes/SSConfig.h'
--- include/unity/scopes/internal/smartscopes/SSConfig.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/smartscopes/SSConfig.h	2014-05-08 12:06:13 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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: Michi Henning <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_SSCONFIG_H
+#define UNITY_SCOPES_INTERNAL_SSCONFIG_H
+
+#include <unity/scopes/internal/ConfigBase.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace smartscopes
+{
+
+class SSConfig : public ConfigBase
+{
+public:
+    SSConfig(std::string const& configfile);
+    ~SSConfig();
+
+    int http_reply_timeout() const;             // seconds
+    int reg_refresh_rate() const;               // seconds
+    int reg_refresh_fail_timeout() const;       // seconds
+    std::string scope_identity() const;
+
+private:
+    int http_reply_timeout_;
+    int reg_refresh_rate_;
+    int reg_refresh_fail_timeout_;
+    std::string scope_identity_;
+};
+
+} // namespace smartscopes
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif
 
=== modified file 'include/unity/scopes/internal/smartscopes/SSRegistryObject.h'
--- include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-04-03 12:57:25 +0000
+++ include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-05-08 12:06:13 +0000
@@ -22,6 +22,7 @@
 #include <unity/scopes/internal/MiddlewareBase.h>
 #include <unity/scopes/internal/RegistryObjectBase.h>
 #include <unity/scopes/internal/smartscopes/SmartScopesClient.h>
+#include <unity/scopes/internal/smartscopes/SSConfig.h>
 
 #include <mutex>
 
@@ -42,8 +43,10 @@
 public:
     UNITY_DEFINES_PTRS(SSRegistryObject);
 
-    SSRegistryObject(MiddlewareBase::SPtr middleware, std::string const& ss_scope_endpoint,
-                     uint http_reply_timeout, uint refresh_rate_in_sec, std::string const& sss_url = "",
+    SSRegistryObject(MiddlewareBase::SPtr middleware,
+                     SSConfig const& ss_config,
+                     std::string const& ss_scope_endpoint,
+                     std::string const& sss_url = "",
                      bool caching_enabled = true);
     virtual ~SSRegistryObject() noexcept;
 
@@ -78,6 +81,7 @@
     std::string ss_scope_endpoint_;
     uint const regular_refresh_timeout_;
     uint next_refresh_timeout_;
+    uint const failed_refresh_timeout_;
 
     bool caching_enabled_;
 };
 
=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqConfig.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2014-05-08 12:06:13 +0000
@@ -33,8 +33,6 @@
 class ZmqConfig : public ConfigBase
 {
 public:
-    static const char* ZMQ_CONFIG_GROUP;
-
     ZmqConfig(std::string const& configfile);
     ~ZmqConfig();
 
 
=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-04-16 07:04:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-05-08 12:06:13 +0000
@@ -53,7 +53,7 @@
 class ZmqMiddleware final : public MiddlewareBase
 {
 public:
-    ZmqMiddleware(std::string const& server_name, std::string const& configfile, RuntimeImpl* runtime);
+    ZmqMiddleware(std::string const& server_name, RuntimeImpl* runtime, std::string const& configfile = "");
     virtual ~ZmqMiddleware();
 
     virtual void start() override;
@@ -63,7 +63,9 @@
     virtual ObjectProxy string_to_proxy(std::string const& s) override;
     virtual std::string proxy_to_string(MWProxy const& proxy) override;
 
-    virtual MWRegistryProxy create_registry_proxy(std::string const& identity, std::string const& endpoint) override;
+    virtual MWRegistryProxy registry_proxy() override;
+    virtual MWRegistryProxy ss_registry_proxy() override;
+
     virtual MWScopeProxy create_scope_proxy(std::string const& identity) override;
     virtual MWScopeProxy create_scope_proxy(std::string const& identity, std::string const& endpoint) override;
     virtual MWQueryProxy create_query_proxy(std::string const& identity, std::string const& endpoint) override;
@@ -110,6 +112,8 @@
 
     std::string server_name_;
     zmqpp::context context_;
+    MWRegistryProxy registry_proxy_;
+    MWRegistryProxy ss_registry_proxy_;
 
     typedef std::map<std::string, std::shared_ptr<ObjectAdapter>> AdapterMap;
     AdapterMap am_;
 
=== modified file 'scoperegistry/CMakeLists.txt'
--- scoperegistry/CMakeLists.txt	2014-03-19 10:03:19 +0000
+++ scoperegistry/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -9,4 +9,4 @@
 add_executable(scoperegistry ${SRC})
 target_link_libraries(scoperegistry ${UNITY_SCOPES_LIB} ${OTHER_LIBS})
 
-install(TARGETS scoperegistry RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/scoperegistry)
+install(TARGETS scoperegistry RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${UNITY_SCOPES_LIB})
 
=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-04-15 04:53:44 +0000
+++ scoperegistry/scoperegistry.cpp	2014-05-08 12:06:13 +0000
@@ -322,22 +322,11 @@
     }
 }
 
-// Overwrite any remote scopes loaded previously with the current ones.
-
-void load_remote_scopes(RegistryObject::SPtr const& registry,
-                        MiddlewareBase::SPtr const& mw,
-                        string const& ss_reg_id,
-                        string const& ss_reg_endpoint)
-{
-    auto ss_reg = mw->create_registry_proxy(ss_reg_id, ss_reg_endpoint);
-    registry->set_remote_registry(ss_reg);
-}
-
 } // namespace
 
 // Usage: scoperegistry [runtime.ini] [scope.ini]...
 //
-// If no runtime config file is specified, the default location (/usr/share/unity-scopes-api/Runtime.ini)
+// If no runtime config file is specified, the default location (/usr/lib/<arch>/unity-scopes/Runtime.ini)
 // is assumed.
 // If additional scope configuration files are specified, the corresponding scopes will be added
 // to the registry (overriding any scopes that are found via config files reached via Runtime.ini).
@@ -370,29 +359,22 @@
         RuntimeImpl::UPtr runtime = RuntimeImpl::create(rt_config.registry_identity(), config_file);
 
         string identity = runtime->registry_identity();
+        string ss_reg_id = runtime->ss_registry_identity();
 
         // Collect the registry config data.
 
         string mw_kind;
-        string mw_endpoint;
-        string mw_configfile;
         string scope_installdir;
         string oem_installdir;
         string click_installdir;
         string scoperunner_path;
-        string ss_reg_id;
-        string ss_reg_endpoint;
         {
             RegistryConfig c(identity, runtime->registry_configfile());
             mw_kind = c.mw_kind();
-            mw_endpoint = c.endpoint();
-            mw_configfile = c.mw_configfile();
             scope_installdir = c.scope_installdir();
             oem_installdir = c.oem_installdir();
             click_installdir = c.click_installdir();
             scoperunner_path = c.scoperunner_path();
-            ss_reg_id = c.ss_registry_identity();
-            ss_reg_endpoint = c.ss_registry_endpoint();
         } // Release memory for config parser
 
         MiddlewareBase::SPtr middleware = runtime->factory()->find(identity, mw_kind);
@@ -434,16 +416,16 @@
             local_scopes[scope_id] = argv[i];                   // operator[] overwrites pre-existing entries
         }
 
-        add_local_scopes(registry, local_scopes, middleware, scoperunner_path, runtime->configfile(), false);
-        add_local_scopes(registry, click_scopes, middleware, scoperunner_path, runtime->configfile(), true);
+        add_local_scopes(registry, local_scopes, middleware, scoperunner_path, config_file, false);
+        add_local_scopes(registry, click_scopes, middleware, scoperunner_path, config_file, true);
         local_scopes.insert(click_scopes.begin(), click_scopes.end());
-        if (ss_reg_id.empty() || ss_reg_endpoint.empty())
+        if (ss_reg_id.empty())
         {
             error("no remote registry configured, only local scopes will be available");
         }
         else
         {
-            load_remote_scopes(registry, middleware, ss_reg_id, ss_reg_endpoint);
+            registry->set_remote_registry(middleware->ss_registry_proxy());
         }
 
         // Let's add the registry's state receiver to the middleware so that scopes can inform
 
=== modified file 'scoperunner/CMakeLists.txt'
--- scoperunner/CMakeLists.txt	2013-11-29 12:20:25 +0000
+++ scoperunner/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -3,4 +3,4 @@
 add_executable(scoperunner ${SRC})
 target_link_libraries(scoperunner ${UNITY_SCOPES_LIB} ${OTHER_LIBS})
 
-install(TARGETS scoperunner RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/scoperunner)
+install(TARGETS scoperunner RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${UNITY_SCOPES_LIB})
 
=== modified file 'smartscopesproxy/CMakeLists.txt'
--- smartscopesproxy/CMakeLists.txt	2014-02-04 10:50:16 +0000
+++ smartscopesproxy/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -3,4 +3,4 @@
 add_executable(smartscopesproxy ${SRC})
 target_link_libraries(smartscopesproxy ${UNITY_SCOPES_LIB} ${OTHER_LIBS})
 
-install(TARGETS smartscopesproxy RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/smartscopesproxy)
+install(TARGETS smartscopesproxy RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${UNITY_SCOPES_LIB})
 
=== modified file 'smartscopesproxy/smartscopesproxy.cpp'
--- smartscopesproxy/smartscopesproxy.cpp	2014-04-09 09:51:32 +0000
+++ smartscopesproxy/smartscopesproxy.cpp	2014-05-08 12:06:13 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <unity/scopes/internal/RegistryConfig.h>
+#include <unity/scopes/internal/RuntimeConfig.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/smartscopes/SSScopeObject.h>
 #include <unity/scopes/internal/smartscopes/SSRegistryObject.h>
@@ -107,14 +108,14 @@
     {
         SignalThreadWrapper signal_handler;
 
-        ///! TODO: get these from config
-        std::string ss_reg_id = "SSRegistry";
-        std::string ss_scope_id = "SmartScope";
-        uint const http_reply_timeout = 20000;
-        uint const ss_reg_refresh_rate = 60 * 60 * 24; // 24 hour refresh (in seconds)
+        RuntimeConfig rt_config(config_file);
+        std::string ss_reg_id = rt_config.ss_registry_identity();
+
+        SSConfig ss_config(rt_config.ss_configfile());
+        std::string ss_scope_id = ss_config.scope_identity();
 
         // Instantiate SS registry and scopes runtimes
-        RuntimeImpl::UPtr reg_rt = RuntimeImpl::create(ss_reg_id, DFLT_SS_RUNTIME_INI);
+        RuntimeImpl::UPtr reg_rt = RuntimeImpl::create(ss_reg_id, config_file);
         RuntimeImpl::UPtr scope_rt = RuntimeImpl::create(ss_scope_id, config_file);
 
         // Get registry config
@@ -133,14 +134,13 @@
         });
 
         // Instantiate a SS registry object
-        SSRegistryObject::SPtr reg(new SSRegistryObject(reg_mw, scope_mw->get_scope_endpoint(),
-                                                        http_reply_timeout, ss_reg_refresh_rate));
+        SSRegistryObject::SPtr reg(new SSRegistryObject(reg_mw, ss_config, scope_mw->get_scope_endpoint()));
 
         // Instantiate a SS scope object
         SSScopeObject::UPtr scope(new SSScopeObject(ss_scope_id, scope_mw, reg));
 
         // Add objects to the middlewares
-        reg_mw->add_registry_object(reg_rt->registry_identity(), reg);
+        reg_mw->add_registry_object(reg_rt->ss_registry_identity(), reg);
         scope_mw->add_dflt_scope_object(std::move(scope));
 
         if (sig_upstart)
 
=== modified file 'src/scopes/Runtime.cpp'
--- src/scopes/Runtime.cpp	2014-04-03 16:46:00 +0000
+++ src/scopes/Runtime.cpp	2014-05-08 12:06:13 +0000
@@ -62,11 +62,16 @@
     return p->registry();
 }
 
-void Runtime::run_scope(ScopeBase *const scope_base, std::string const& scope_ini_file)
+void Runtime::run_scope(ScopeBase* const scope_base, std::string const& scope_ini_file)
 {
     p->run_scope(scope_base, scope_ini_file);
 }
 
+void Runtime::run_scope(ScopeBase* const scope_base, std::string const& runtime_ini_file, std::string const& scope_ini_file)
+{
+    p->run_scope(scope_base, runtime_ini_file, scope_ini_file);
+}
+
 ObjectProxy Runtime::string_to_proxy(string const& s) const
 {
     return p->string_to_proxy(s);
 
=== modified file 'src/scopes/internal/ConfigBase.cpp'
--- src/scopes/internal/ConfigBase.cpp	2014-02-26 11:32:43 +0000
+++ src/scopes/internal/ConfigBase.cpp	2014-05-08 12:06:13 +0000
@@ -18,10 +18,15 @@
 
 #include <unity/scopes/internal/ConfigBase.h>
 
+#include <unity/scopes/internal/DfltConfig.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 #include <unity/util/IniParser.h>
 
+#include <boost/filesystem/path.hpp>
+
+#include <iostream>
+#include <sys/stat.h>
 
 using namespace std;
 
@@ -37,13 +42,38 @@
 // If configfile is the empty string, we create a default instance that returns "Zmq" for the middleware
 // and throws for the other methods.
 
-ConfigBase::ConfigBase(string const& configfile) :
+ConfigBase::ConfigBase(string const& configfile, string const& dflt_file) :
     parser_(nullptr),
     configfile_(configfile)
 {
     if (!configfile.empty())
     {
-        parser_ = make_shared<util::IniParser>(configfile.c_str());
+        boost::filesystem::path path(configfile);
+        if (path.extension() != ".ini")
+        {
+            throw ConfigException(string("invalid config file name: \"") + configfile + "\": missing .ini extension");
+        }
+    }
+    if (configfile.empty() || configfile == dflt_file)
+    {
+        // No configfile was specified or it was the same as dflt_file.
+        // We check whether dflt_file exists. If so, we use it. Otherwise,
+        // we don't have a configfile at all and run with defaults.
+        if (path_exists(dflt_file))
+        {
+            parser_ = make_shared<util::IniParser>(dflt_file.c_str());
+            configfile_ = dflt_file;
+        }
+    }
+    else
+    {
+        // The configfile was specified and differs from dflt_file,
+        // so we use it.
+        if (configfile != dflt_file)
+        {
+            parser_ = make_shared<util::IniParser>(configfile.c_str());
+            configfile_ = configfile;
+        }
     }
 }
 
@@ -70,15 +100,19 @@
     return val;
 }
 
-string ConfigBase::get_optional_string(string const& group, string const& key) const
+string ConfigBase::get_optional_string(string const& group, string const& key, string const& dflt) const
 {
     try
     {
+        if (!parser_)
+        {
+            return dflt;
+        }
         return parser()->get_string(group, key);
     }
     catch (unity::LogicException const&)
     {
-        return string();
+        return dflt;
     }
 }
 
@@ -86,9 +120,13 @@
 {
     if (!parser_)
     {
-        return "Zmq";
-    }
-    string val = get_string(group, key);
+        return DFLT_MIDDLEWARE;
+    }
+    string val = get_optional_string(group, key);
+    if (val.empty())
+    {
+        return DFLT_MIDDLEWARE;
+    }
     if (val != "Zmq" && val != "REST")
     {
         throw_ex("Illegal value for " + key + ": \"" + val +
@@ -103,6 +141,50 @@
     throw ConfigException(s);
 }
 
+bool ConfigBase::path_exists(string const& path) const
+{
+    struct stat st;
+    return stat(path.c_str(), &st) == 0;
+}
+
+// Check whether a configuration file contains unknown groups
+// or unknown keys within a known group. This is useful to catch typos.
+// For example, if a config file contains "Smartscopes.Registry.Idenity" instead
+// of "Smartscopes.Registry.Identity" (did you spot it?), we print a warning,
+// so people don't endlessly scratch their heads as to why the config
+// isn't working for them.
+//
+// KnownEntries is a map of <group, set<key>> pairs that contains
+// the known keys for each group. Anything in the config file that
+// is not found in the map generates a warning.
+
+void ConfigBase::check_unknown_entries(KnownEntries const& known_entries) const
+{
+    if (!parser_)
+    {
+        return;
+    }
+    auto const groups = parser()->get_groups();
+    for (auto const& group : groups)
+    {
+        auto const it = known_entries.find(group);
+        if (it == known_entries.end())
+        {
+            cerr << "warning: ignoring unknown group " << group << " in file " << configfile_ << endl;
+            continue;
+        }
+        auto keys = parser()->get_keys(group);
+        for (auto const& key : keys)
+        {
+            if (it->second.find(key) == it->second.end())
+            {
+                cerr << "warning: ignoring unknown key " << key << " in group " << group
+                     << " in file " << configfile_ << endl;
+            }
+        }
+    }
+}
+
 } // namespace internal
 
 } // namespace scopes
 
=== modified file 'src/scopes/internal/MiddlewareFactory.cpp'
--- src/scopes/internal/MiddlewareFactory.cpp	2014-02-04 21:32:07 +0000
+++ src/scopes/internal/MiddlewareFactory.cpp	2014-05-08 12:06:13 +0000
@@ -62,7 +62,7 @@
     {
         case Kind_Zmq:
         {
-            mw = make_shared<zmq_middleware::ZmqMiddleware>(server_name, configfile, runtime_);
+            mw = make_shared<zmq_middleware::ZmqMiddleware>(server_name, runtime_, configfile);
             break;
         }
         case Kind_REST:
 
=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp	2014-05-08 07:25:37 +0000
+++ src/scopes/internal/RegistryConfig.cpp	2014-05-08 12:06:13 +0000
@@ -18,6 +18,7 @@
 
 #include <unity/scopes/internal/RegistryConfig.h>
 
+#include <unity/scopes/internal/DfltConfig.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
@@ -32,23 +33,30 @@
 namespace internal
 {
 
-constexpr char const* RegistryConfig::REGISTRY_CONFIG_GROUP;
+namespace
+{
+    const string registry_config_group = "Registry";
+    const string mw_kind_key = "Middleware";
+    const string configfile_key = ".ConfigFile";
+    const string scope_installdir_key = "Scope.InstallDir";
+    const string oem_installdir_key = "OEM.InstallDir";
+    const string click_installdir_key = "Click.InstallDir";
+    const string scoperunner_path_key = "Scoperunner.Path";
+}
 
 RegistryConfig::RegistryConfig(string const& identity, string const& configfile) :
-    ConfigBase(configfile)
+    ConfigBase(configfile, DFLT_REGISTRY_INI)
 {
     identity_ = identity;
     if (identity.empty())
     {
         throw InvalidArgumentException("Registry identity cannot be an empty string");
     }
-    mw_kind_ = get_middleware(REGISTRY_CONFIG_GROUP, "Middleware");
-    endpointdir_ = get_string(REGISTRY_CONFIG_GROUP, mw_kind_ + ".EndpointDir");
-    endpoint_ = get_string(REGISTRY_CONFIG_GROUP, mw_kind_ + ".Endpoint");
-    mw_configfile_ = get_string(REGISTRY_CONFIG_GROUP, mw_kind_ + ".ConfigFile");
-    scope_installdir_ = get_string(REGISTRY_CONFIG_GROUP, "Scope.InstallDir");
-    oem_installdir_ = get_optional_string(REGISTRY_CONFIG_GROUP, "OEM.InstallDir");
-    click_installdir_ = get_optional_string(REGISTRY_CONFIG_GROUP, "Click.InstallDir");
+    mw_kind_ = get_middleware(registry_config_group, mw_kind_key);
+    mw_configfile_ = get_optional_string(registry_config_group, mw_kind_ + configfile_key);
+    scope_installdir_ = get_optional_string(registry_config_group, scope_installdir_key, DFLT_SCOPE_INSTALL_DIR);
+    oem_installdir_ = get_optional_string(registry_config_group, oem_installdir_key, DFLT_OEM_INSTALL_DIR);
+    click_installdir_ = get_optional_string(registry_config_group, click_installdir_key);
     if (click_installdir_.empty())
     {
         char const* home = getenv("HOME");
@@ -58,13 +66,25 @@
         }
         click_installdir_ = string(home) + "/.local/share/unity-scopes/";
     }
-    scoperunner_path_ = get_string(REGISTRY_CONFIG_GROUP, "Scoperunner.Path");
+    scoperunner_path_ = get_optional_string(registry_config_group, scoperunner_path_key, DFLT_SCOPERUNNER_PATH);
     if (scoperunner_path_[0] != '/')
     {
-        throw ConfigException(configfile + ": Scoperunner.Path must be an absolute path");
+        throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
     }
-    ss_registry_identity_ = get_optional_string(REGISTRY_CONFIG_GROUP, "SS.Registry.Identity");
-    ss_registry_endpoint_ = get_optional_string(REGISTRY_CONFIG_GROUP, "SS.Registry.Endpoint");
+
+    const KnownEntries known_entries = {
+                                          {  registry_config_group,
+                                             {
+                                                mw_kind_key,
+                                                mw_kind_ + configfile_key,
+                                                scope_installdir_key,
+                                                oem_installdir_key,
+                                                click_installdir_key,
+                                                scoperunner_path_key,
+                                             }
+                                          }
+                                       };
+    check_unknown_entries(known_entries);
 }
 
 RegistryConfig::~RegistryConfig()
@@ -81,16 +101,6 @@
     return mw_kind_;
 }
 
-string RegistryConfig::endpointdir() const
-{
-    return endpointdir_;
-}
-
-string RegistryConfig::endpoint() const
-{
-    return endpoint_;
-}
-
 string RegistryConfig::mw_configfile() const
 {
     return mw_configfile_;
@@ -116,16 +126,6 @@
     return scoperunner_path_;
 }
 
-string RegistryConfig::ss_registry_identity() const
-{
-    return ss_registry_identity_;
-}
-
-string RegistryConfig::ss_registry_endpoint() const
-{
-    return ss_registry_endpoint_;
-}
-
 } // namespace internal
 
 } // namespace scopes
 
=== modified file 'src/scopes/internal/RegistryObject.cpp'
--- src/scopes/internal/RegistryObject.cpp	2014-04-15 04:53:44 +0000
+++ src/scopes/internal/RegistryObject.cpp	2014-05-08 12:06:13 +0000
@@ -90,25 +90,36 @@
 
 ScopeMetadata RegistryObject::get_metadata(std::string const& scope_id) const
 {
-    lock_guard<decltype(mutex_)> lock(mutex_);
-    // If the id is empty, it was sent as empty by the remote client.
     if (scope_id.empty())
     {
+        // If the id is empty, it was sent as empty by the remote client.
         throw unity::InvalidArgumentException("RegistryObject::get_metadata(): Cannot search for scope with empty id");
     }
 
     // Look for the scope in both the local and the remote map.
-    // Local scopes take precedence over remote ones of the same
-    // id. (Ideally, this should never happen.)
-    auto const& scope_it = scopes_.find(scope_id);
-    if (scope_it != scopes_.end())
+    // Local scopes take precedence over remote ones of the same id.
+    // (Ideally, this should never happen.)
     {
-        return scope_it->second;
+        lock_guard<decltype(mutex_)> lock(mutex_);
+        auto const& scope_it = scopes_.find(scope_id);
+        if (scope_it != scopes_.end())
+        {
+            return scope_it->second;
+        }
     }
+    // Unlock, so we don't call the remote registry while holding a lock.
 
     if (remote_registry_)
     {
-        return remote_registry_->get_metadata(scope_id);
+        try
+        {
+            return remote_registry_->get_metadata(scope_id);
+        }
+        catch (std::exception const& e)
+        {
+            cerr << "cannot get metdata from remote registry: " << e.what() << endl;
+            // TODO: log error
+        }
     }
 
     throw NotFoundException("RegistryObject::get_metadata(): no such scope: ",  scope_id);
@@ -116,16 +127,28 @@
 
 MetadataMap RegistryObject::list() const
 {
-    lock_guard<decltype(mutex_)> lock(mutex_);
-    MetadataMap all_scopes(scopes_);  // Local scopes
+    MetadataMap all_scopes;  // Local scopes
+    {
+        lock_guard<decltype(mutex_)> lock(mutex_);
+        all_scopes = scopes_;  // Local scopes
+    }
+    // Unlock, so we don't call the remote registry while holding a lock.
 
     // If a remote scope has the same id as a local one,
     // this will not overwrite a local scope with a remote
     // one if they have the same id.
     if (remote_registry_)
     {
-        MetadataMap remote_scopes = remote_registry_->list();
-        all_scopes.insert(remote_scopes.begin(), remote_scopes.end());
+        try
+        {
+            MetadataMap remote_scopes = remote_registry_->list();
+            all_scopes.insert(remote_scopes.begin(), remote_scopes.end());
+        }
+        catch (std::exception const& e)
+        {
+            cerr << "cannot get scopes list from remote registry: " << e.what() << endl;
+            // TODO: log error
+        }
     }
 
     return all_scopes;
@@ -133,22 +156,23 @@
 
 ObjectProxy RegistryObject::locate(std::string const& identity)
 {
-    decltype(scopes_.cbegin()) scope_it;
-    decltype(scope_processes_.begin()) proc_it;
+    // If the id is empty, it was sent as empty by the remote client.
+    if (identity.empty())
+    {
+        throw unity::InvalidArgumentException("RegistryObject::locate(): Cannot locate scope with empty id");
+    }
 
+    ObjectProxy proxy;
+    ProcessMap::iterator proc_it;
     {
         lock_guard<decltype(mutex_)> lock(mutex_);
-        // If the id is empty, it was sent as empty by the remote client.
-        if (identity.empty())
-        {
-            throw unity::InvalidArgumentException("RegistryObject::locate(): Cannot locate scope with empty id");
-        }
 
-        scope_it = scopes_.find(identity);
+        auto scope_it = scopes_.find(identity);
         if (scope_it == scopes_.end())
         {
             throw NotFoundException("RegistryObject::locate(): Tried to locate unknown local scope", identity);
         }
+        proxy = scope_it->second.proxy();
 
         proc_it = scope_processes_.find(identity);
         if (proc_it == scope_processes_.end())
@@ -157,15 +181,15 @@
         }
     }
 
+    // Exec after unlocking, so we can start processing another locate()
     proc_it->second.exec(death_observer_, executor_);
-    return scope_it->second.proxy();
+
+    return proxy;
 }
 
 bool RegistryObject::add_local_scope(std::string const& scope_id, ScopeMetadata const& metadata,
                                      ScopeExecData const& exec_data)
 {
-    lock_guard<decltype(mutex_)> lock(mutex_);
-    bool return_value = true;
     if (scope_id.empty())
     {
         throw unity::InvalidArgumentException("RegistryObject::add_local_scope(): Cannot add scope with empty id");
@@ -175,6 +199,9 @@
         throw unity::InvalidArgumentException("RegistryObject::add_local_scope(): Cannot create a scope with '/' in its id");
     }
 
+    lock_guard<decltype(mutex_)> lock(mutex_);
+
+    bool return_value = true;
     if (scopes_.find(scope_id) != scopes_.end())
     {
         scopes_.erase(scope_id);
@@ -188,7 +215,6 @@
 
 bool RegistryObject::remove_local_scope(std::string const& scope_id)
 {
-    lock_guard<decltype(mutex_)> lock(mutex_);
     // If the id is empty, it was sent as empty by the remote client.
     if (scope_id.empty())
     {
@@ -196,6 +222,8 @@
                                               "with empty id");
     }
 
+    lock_guard<decltype(mutex_)> lock(mutex_);
+
     scope_processes_.erase(scope_id);
     return scopes_.erase(scope_id) == 1;
 }
@@ -208,6 +236,8 @@
 
 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())
     {
@@ -224,14 +254,16 @@
 
 void RegistryObject::on_process_death(core::posix::Process const& process)
 {
-    // the death observer has signaled that a child has died.
-    // broadcast this message to each scope process until we have found the process in question.
-    // (this is slightly more efficient than just connecting the signal to every scope process)
+    // The death observer has signaled that a child has died.
+    // Broadcast this message to each scope process until we have found the process in question.
+    // (This is slightly more efficient than just connecting the signal to every scope process.)
     pid_t pid = process.pid();
     for (auto& scope_process : scope_processes_)
     {
         if (scope_process.second.on_process_death(pid))
+        {
             break;
+        }
     }
 }
 
 
=== modified file 'src/scopes/internal/RuntimeConfig.cpp'
--- src/scopes/internal/RuntimeConfig.cpp	2014-02-05 13:08:06 +0000
+++ src/scopes/internal/RuntimeConfig.cpp	2014-05-08 12:06:13 +0000
@@ -20,6 +20,7 @@
 
 #include <unity/scopes/internal/DfltConfig.h>
 #include <unity/UnityExceptions.h>
+#include <iostream>  // TODO: remove this
 
 using namespace std;
 
@@ -32,14 +33,15 @@
 namespace internal
 {
 
-const char* RuntimeConfig::RUNTIME_CONFIG_GROUP = "Runtime";
-
 namespace
 {
-    const string registry_identity_str = "Registry.Identity";
-    const string registry_configfile_str = "Registry.ConfigFile";
-    const string default_middleware_str = "Default.Middleware";
-    const string default_middleware_configfile_str = "ConfigFile";
+    const string runtime_config_group = "Runtime";
+    const string registry_identity_key = "Registry.Identity";
+    const string registry_configfile_key = "Registry.ConfigFile";
+    const string ss_registry_identity_key = "Smartscopes.Registry.Identity";
+    const string ss_configfile_key = "Smartscopes.ConfigFile";
+    const string default_middleware_key = "Default.Middleware";
+    const string default_middleware_configfile_key = ".ConfigFile";
 }
 
 RuntimeConfig::RuntimeConfig(string const& configfile) :
@@ -47,25 +49,38 @@
 {
     if (configfile.empty())  // Default config
     {
-        registry_identity_ = "Registry";
+        registry_identity_ = DFLT_REGISTRY_ID;
         registry_configfile_ = DFLT_REGISTRY_INI;
-        default_middleware_ = "Zmq";
-        default_middleware_configfile_ = "Zmq.ini";
+        ss_registry_identity_ = DFLT_SS_REGISTRY_ID;
+        ss_configfile_ = DFLT_SS_INI;
+        default_middleware_ = DFLT_MIDDLEWARE;
+        default_middleware_configfile_ = DFLT_ZMQ_MIDDLEWARE_INI;
     }
     else
     {
-        registry_identity_ = get_optional_string(RUNTIME_CONFIG_GROUP, registry_identity_str);
-        auto pos = registry_identity_.find_first_of("@:/");
-        if (pos != string::npos)
-        {
-            throw_ex("Illegal character in value for " + registry_identity_str + ": \"" + registry_identity_ +
-                     "\": identity cannot contain '" + registry_identity_[pos] + "'");
-        }
-        registry_configfile_ = get_optional_string(RUNTIME_CONFIG_GROUP, registry_configfile_str);
-        default_middleware_ = get_middleware(RUNTIME_CONFIG_GROUP, default_middleware_str);
-        default_middleware_configfile_ = get_string(RUNTIME_CONFIG_GROUP,
-                                                    default_middleware_ + "." + default_middleware_configfile_str);
+        registry_identity_ = get_optional_string(runtime_config_group, registry_identity_key);
+        registry_configfile_ = get_optional_string(runtime_config_group, registry_configfile_key);
+        ss_configfile_ = get_optional_string(runtime_config_group, ss_configfile_key);
+        ss_registry_identity_ = get_optional_string(runtime_config_group, ss_registry_identity_key);
+        default_middleware_ = get_middleware(runtime_config_group, default_middleware_key);
+        default_middleware_configfile_ = get_optional_string(runtime_config_group,
+                                                             default_middleware_ + default_middleware_configfile_key,
+                                                             DFLT_MIDDLEWARE_INI);
     }
+
+    const KnownEntries known_entries = {
+                                          {  runtime_config_group,
+                                             {
+                                                registry_identity_key,
+                                                registry_configfile_key,
+                                                ss_registry_identity_key,
+                                                ss_configfile_key,
+                                                default_middleware_key,
+                                                default_middleware_ + default_middleware_configfile_key
+                                             }
+                                          }
+                                       };
+    check_unknown_entries(known_entries);
 }
 
 RuntimeConfig::~RuntimeConfig()
@@ -82,6 +97,16 @@
     return registry_configfile_;
 }
 
+string RuntimeConfig::ss_registry_identity() const
+{
+    return ss_registry_identity_;
+}
+
+string RuntimeConfig::ss_configfile() const
+{
+    return ss_configfile_;
+}
+
 string RuntimeConfig::default_middleware() const
 {
     return default_middleware_;
 
=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
--- src/scopes/internal/RuntimeImpl.cpp	2014-04-28 06:24:24 +0000
+++ src/scopes/internal/RuntimeImpl.cpp	2014-05-08 12:06:13 +0000
@@ -64,18 +64,17 @@
         scope_id_ = "c-" + id.gen();
     }
 
-    string config_file(configfile.empty() ? DFLT_RUNTIME_INI : configfile);
-    configfile_ = config_file;
-
     try
     {
         // Create the middleware factory and get the registry identity and config filename.
-        RuntimeConfig config(config_file);
+        RuntimeConfig config(configfile);
         string default_middleware = config.default_middleware();
         string middleware_configfile = config.default_middleware_configfile();
         middleware_factory_.reset(new MiddlewareFactory(this));
         registry_configfile_ = config.registry_configfile();
         registry_identity_ = config.registry_identity();
+        ss_configfile_ = config.ss_configfile();
+        ss_registry_identity_ = config.ss_registry_identity();
 
         middleware_ = middleware_factory_->create(scope_id_, default_middleware, middleware_configfile);
         middleware_->start();
@@ -91,18 +90,15 @@
         }
         else
         {
-            // Create the registry proxy.
+            // Create the registry proxy
             RegistryConfig reg_config(registry_identity_, registry_configfile_);
-            string reg_mw_configfile = reg_config.mw_configfile();
-            registry_endpoint_ = reg_config.endpoint();
-            registry_endpointdir_ = reg_config.endpointdir();
-            auto registry_mw_proxy = middleware_->create_registry_proxy(registry_identity_, registry_endpoint_);
+            auto registry_mw_proxy = middleware_->registry_proxy();
             registry_ = make_shared<RegistryImpl>(registry_mw_proxy, this);
         }
     }
     catch (unity::Exception const& e)
     {
-        throw ConfigException("Cannot instantiate run time for " + scope_id + ", config file: " + config_file);
+        throw ConfigException("Cannot instantiate run time for " + scope_id_ + ", config file: " + configfile);
     }
 }
 
@@ -169,8 +165,6 @@
     middleware_->wait_for_shutdown();
     middleware_ = nullptr;
     middleware_factory_.reset(nullptr);
-
-    registry_ = nullptr;
 }
 
 string RuntimeImpl::scope_id() const
@@ -179,11 +173,6 @@
     return scope_id_;
 }
 
-string RuntimeImpl::configfile() const
-{
-    return configfile_;
-}
-
 MiddlewareFactory const* RuntimeImpl::factory() const
 {
     lock_guard<mutex> lock(mutex_);
@@ -212,26 +201,22 @@
 
 string RuntimeImpl::registry_configfile() const
 {
-    lock_guard<mutex> lock(mutex_);
-    return registry_configfile_;
+    return registry_configfile_;  // Immutable
 }
 
 string RuntimeImpl::registry_identity() const
 {
-    lock_guard<mutex> lock(mutex_);
-    return registry_identity_;
-}
-
-string RuntimeImpl::registry_endpointdir() const
-{
-    lock_guard<mutex> lock(mutex_);
-    return registry_endpointdir_;
-}
-
-string RuntimeImpl::registry_endpoint() const
-{
-    lock_guard<mutex> lock(mutex_);
-    return registry_endpoint_;
+    return registry_identity_;  // Immutable
+}
+
+string RuntimeImpl::ss_configfile() const
+{
+    return ss_configfile_;  // Immutable
+}
+
+string RuntimeImpl::ss_registry_identity() const
+{
+    return ss_registry_identity_;  // Immutable
 }
 
 Reaper::SPtr RuntimeImpl::reply_reaper() const
@@ -270,15 +255,19 @@
 
 ThreadSafeQueue<future<void>>::SPtr RuntimeImpl::future_queue() const
 {
-    lock_guard<mutex> lock(mutex_);
-    return future_queue_;
-}
-
-void RuntimeImpl::run_scope(ScopeBase *const scope_base, std::string const& scope_ini_file)
+    return future_queue_;  // Immutable
+}
+
+void RuntimeImpl::run_scope(ScopeBase *const scope_base, string const& scope_ini_file)
+{
+    run_scope(scope_base, "", scope_ini_file);
+}
+
+void RuntimeImpl::run_scope(ScopeBase *const scope_base, string const& runtime_ini_file, string const& scope_ini_file)
 {
     // Retrieve the registry middleware and create a proxy to its state receiver
     RegistryConfig reg_conf(registry_identity_, registry_configfile_);
-    auto reg_runtime = create(registry_identity_, configfile_);
+    auto reg_runtime = create(registry_identity_, runtime_ini_file);
     auto reg_mw = reg_runtime->factory()->find(registry_identity_, reg_conf.mw_kind());
     auto reg_state_receiver = reg_mw->create_state_receiver_proxy("StateReceiver");
 
@@ -286,8 +275,8 @@
 
     {
         // dirname modifies its argument, so we need a copy of scope lib path
-        std::vector<char> scope_ini(scope_ini_file.c_str(), scope_ini_file.c_str() + scope_ini_file.size() + 1);
-        const std::string scope_dir(dirname(&scope_ini[0]));
+        vector<char> scope_ini(scope_ini_file.c_str(), scope_ini_file.c_str() + scope_ini_file.size() + 1);
+        const string scope_dir(dirname(&scope_ini[0]));
         scope_base->p->set_scope_directory(scope_dir);
     }
 
 
=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-04-23 13:26:03 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-05-08 12:06:13 +0000
@@ -37,16 +37,19 @@
 
 namespace
 {
-    const string overrideable_str = "Override";
-    const string scope_name_str = "DisplayName";
-    const string description_str = "Description";
-    const string author_str = "Author";
-    const string art_str = "Art";
-    const string icon_str = "Icon";
-    const string search_hint_str = "SearchHint";
-    const string hot_key_str = "HotKey";
-    const string invisible_str = "Invisible";
-    const string scope_runner_exec = "ScopeRunner";
+    const string scope_config_group = "ScopeConfig";
+    const string overrideable_key = "Override";
+    const string scope_name_key = "DisplayName";
+    const string description_key = "Description";
+    const string author_key = "Author";
+    const string art_key = "Art";
+    const string icon_key = "Icon";
+    const string search_hint_key = "SearchHint";
+    const string hot_key_key = "HotKey";
+    const string invisible_key = "Invisible";
+    const string scoperunner_key = "ScopeRunner";
+
+    const string scope_appearance_group = "Appearance";
 }
 
 ScopeConfig::ScopeConfig(string const& configfile) :
@@ -54,23 +57,23 @@
 {
     try
     {
-        overrideable_ = parser()->get_boolean(SCOPE_CONFIG_GROUP, overrideable_str);
+        overrideable_ = parser()->get_boolean(scope_config_group, overrideable_key);
     }
     catch (LogicException const&)
     {
         overrideable_ = false;
     }
 
-    display_name_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, scope_name_str);
-    description_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, description_str);
-    author_ = parser()->get_string(SCOPE_CONFIG_GROUP, author_str);
+    display_name_ = parser()->get_locale_string(scope_config_group, scope_name_key);
+    description_ = parser()->get_locale_string(scope_config_group, description_key);
+    author_ = parser()->get_string(scope_config_group, author_key);
 
     // For optional values, we store them in a unique_ptr so we can distinguish the "not set at all" case
     // from the "explicitly set to empty string" case. parser()->get_string throws LogicException if
     // the key is not present, so we ignore the exception for optional values.
     try
     {
-        string art = parser()->get_string(SCOPE_CONFIG_GROUP, art_str);
+        string art = parser()->get_string(scope_config_group, art_key);
         art_.reset(new string(art));
     }
     catch (LogicException const&)
@@ -78,7 +81,7 @@
     }
     try
     {
-        string icon = parser()->get_string(SCOPE_CONFIG_GROUP, icon_str);
+        string icon = parser()->get_string(scope_config_group, icon_key);
         icon_.reset(new string(icon));
     }
     catch (LogicException const&)
@@ -86,7 +89,7 @@
     }
     try
     {
-        string hint = parser()->get_locale_string(SCOPE_CONFIG_GROUP, search_hint_str);
+        string hint = parser()->get_locale_string(scope_config_group, search_hint_key);
         search_hint_.reset(new string(hint));
     }
     catch (LogicException const&)
@@ -94,7 +97,7 @@
     }
     try
     {
-        string key = parser()->get_string(SCOPE_CONFIG_GROUP, hot_key_str);
+        string key = parser()->get_string(scope_config_group, hot_key_key);
         hot_key_.reset(new string(key));
     }
     catch (LogicException const&)
@@ -102,35 +105,58 @@
     }
     try
     {
-        string key = parser()->get_string(SCOPE_CONFIG_GROUP, invisible_str);
-        std::transform(begin(key), end(key), begin(key), ::toupper);
-        invisible_.reset(new bool(key == "TRUE"));
+        invisible_ = parser()->get_boolean(scope_config_group, invisible_key);
     }
     catch (LogicException const&)
     {
+        invisible_ = false;
     }
 
     // custom scope runner executable is optional
     try
     {
-        string key = parser()->get_string(SCOPE_CONFIG_GROUP, scope_runner_exec);
+        string key = parser()->get_string(scope_config_group, scoperunner_key);
         scope_runner_.reset(new string(key));
     }
     catch (LogicException const&)
     {
     }
 
-    // read all display attributes from SCOPE_DISPLAY_GROUP config group
+    // read all display attributes from scope_appearance_group
     try
     {
-        for (auto const& key: parser()->get_keys(SCOPE_DISPLAY_GROUP))
+        for (auto const& key: parser()->get_keys(scope_appearance_group))
         {
-            appearance_attributes_[key] = parser()->get_string(SCOPE_DISPLAY_GROUP, key);
+            appearance_attributes_[key] = parser()->get_string(scope_appearance_group, key);
         }
     }
     catch (LogicException const&)
     {
     }
+
+    const KnownEntries known_entries = {
+                                          {  scope_config_group,
+                                             {
+                                                overrideable_key,
+                                                scope_name_key,
+                                                description_key,
+                                                author_key,
+                                                art_key,
+                                                icon_key,
+                                                search_hint_key,
+                                                invisible_key,
+                                                hot_key_key,
+                                                scoperunner_key
+                                             }
+                                          },
+                                          // TODO: once we know what appearance attributes are supported,
+                                          //       we need to add them here.
+                                          {  scope_appearance_group,
+                                             {
+                                             }
+                                          }
+                                       };
+    check_unknown_entries(known_entries);
 }
 
 ScopeConfig::~ScopeConfig()
@@ -161,7 +187,7 @@
 {
     if (!art_)
     {
-        throw NotFoundException("Art not set", art_str);
+        throw NotFoundException("Art not set", art_key);
     }
     return *art_;
 }
@@ -170,7 +196,7 @@
 {
     if (!icon_)
     {
-        throw NotFoundException("Icon not set", icon_str);
+        throw NotFoundException("Icon not set", icon_key);
     }
     return *icon_;
 }
@@ -179,7 +205,7 @@
 {
     if (!search_hint_)
     {
-        throw NotFoundException("Hint not set", search_hint_str);
+        throw NotFoundException("Hint not set", search_hint_key);
     }
     return *search_hint_;
 }
@@ -188,25 +214,21 @@
 {
     if (!hot_key_)
     {
-        throw NotFoundException("Key not set", hot_key_str);
+        throw NotFoundException("Key not set", hot_key_key);
     }
     return *hot_key_;
 }
 
 bool ScopeConfig::invisible() const
 {
-    if (!invisible_)
-    {
-        return false;
-    }
-    return *invisible_;
+    return invisible_;
 }
 
 string ScopeConfig::scope_runner() const
 {
     if (!scope_runner_)
     {
-        throw NotFoundException("Runner binary not set", scope_runner_exec);
+        throw NotFoundException("Runner binary not set", scoperunner_key);
     }
     return *scope_runner_;
 }
 
=== modified file 'src/scopes/internal/smartscopes/CMakeLists.txt'
--- src/scopes/internal/smartscopes/CMakeLists.txt	2014-02-13 07:43:40 +0000
+++ src/scopes/internal/smartscopes/CMakeLists.txt	2014-05-08 12:06:13 +0000
@@ -1,4 +1,5 @@
 set(SRC
+    ${CMAKE_CURRENT_SOURCE_DIR}/SSConfig.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSQueryCtrlObject.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSQueryObject.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSRegistryObject.cpp
 
=== added file 'src/scopes/internal/smartscopes/SSConfig.cpp'
--- src/scopes/internal/smartscopes/SSConfig.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/smartscopes/SSConfig.cpp	2014-05-08 12:06:13 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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: Michi Henning <[e-mail]>
+ */
+
+#include <unity/scopes/internal/smartscopes/SSConfig.h>
+
+#include <unity/scopes/internal/DfltConfig.h>
+#include <unity/scopes/ScopeExceptions.h>
+
+#include <unistd.h>
+
+#include <unity/UnityExceptions.h> // TODO: remove this in config-fixes-stage2 merge proposal
+
+using namespace std;
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace smartscopes
+{
+
+namespace
+{
+    const string ss_config_group = "Smartscopes";
+    const string http_reply_timeout_key = "Http.Reply.Timeout";
+    const string reg_refresh_rate_key = "Registry.Refresh.Rate";
+    const string reg_refresh_fail_timeout_key = "Registry.Refresh.Fail.Timeout";
+    const string scope_identity_key = "Scope.Identity";
+}
+
+SSConfig::SSConfig(string const& configfile) :
+    ConfigBase(configfile, DFLT_SS_INI)
+{
+    if (configfile.empty())
+    {
+        http_reply_timeout_ = DFLT_SS_HTTP_TIMEOUT;
+        reg_refresh_rate_ = DFLT_SS_REG_REFRESH_RATE;
+        reg_refresh_fail_timeout_ = DFLT_SS_REG_REFRESH_FAIL_TIMEOUT;
+        scope_identity_ = DFLT_SS_SCOPE_IDENTITY;
+    }
+    else
+    {
+        // TODO: replace code below with commented-out lines as part of config-fixes-stage2 merge proposal:
+        // http_reply_timeout_ = get_optional_int(ss_config_group, http_reply_timeout_key, DFLT_SS_HTTP_TIMEOUT);
+        // reg_refresh_rate_ = get_optional_int(ss_config_group, reg_refresh_rate_key, DFLT_SS_REG_REFRESH);
+        // reg_refresh_fail_timeout_ = get_optional_int(ss_config_group,
+        //                                              reg_refresh_fail_timeout_key,
+        //                                              DFLT_SS_REG_REFRESH_FAIL_TIMEOUT);
+        // scope_identity_ = get_optional_int(ss_config_group, scope_identity_key, DFLT_SS_SCOPE_IDENTITY);
+        try
+        {
+            http_reply_timeout_ = parser()->get_int(ss_config_group, http_reply_timeout_key);
+            reg_refresh_rate_ = parser()->get_int(ss_config_group, reg_refresh_rate_key);
+            reg_refresh_fail_timeout_ = parser()->get_int(ss_config_group, reg_refresh_fail_timeout_key);
+            scope_identity_ = parser()->get_int(ss_config_group, scope_identity_key);
+        }
+        catch (unity::LogicException const&)
+        {
+            http_reply_timeout_ = DFLT_SS_HTTP_TIMEOUT;
+            reg_refresh_rate_ = DFLT_SS_REG_REFRESH_RATE;
+            reg_refresh_fail_timeout_ = DFLT_SS_REG_REFRESH_FAIL_TIMEOUT;
+            scope_identity_ = DFLT_SS_SCOPE_IDENTITY;
+        }
+    }
+
+    const KnownEntries known_entries = {
+                                          {  ss_config_group,
+                                             {
+                                                http_reply_timeout_key,
+                                                reg_refresh_rate_key,
+                                                reg_refresh_fail_timeout_key,
+                                                scope_identity_key,
+                                             }
+                                          }
+                                       };
+    check_unknown_entries(known_entries);
+}
+
+SSConfig::~SSConfig()
+{
+}
+
+int SSConfig::http_reply_timeout() const
+{
+    return http_reply_timeout_;
+}
+
+int SSConfig::reg_refresh_rate() const
+{
+    return reg_refresh_rate_;
+}
+
+int SSConfig::reg_refresh_fail_timeout() const
+{
+    return reg_refresh_fail_timeout_;
+}
+
+string SSConfig::scope_identity() const
+{
+    return scope_identity_;
+}
+
+} // namespace smartscopes
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity
 
=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-04-03 12:57:25 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-05-08 12:06:13 +0000
@@ -28,7 +28,6 @@
 
 #include <iostream>
 
-static const uint c_failed_refresh_timeout = 10; ///! TODO get from config
 static const char* c_dbussend_cmd = "dbus-send /com/canonical/unity/scopes com.canonical.unity.scopes.InvalidateResults string:smart-scopes";
 
 namespace unity
@@ -44,19 +43,19 @@
 {
 
 SSRegistryObject::SSRegistryObject(MiddlewareBase::SPtr middleware,
+                                   SSConfig const& ss_config,
                                    std::string const& ss_scope_endpoint,
-                                   uint http_reply_timeout,
-                                   uint refresh_rate_in_sec,
                                    std::string const& sss_url,
                                    bool caching_enabled)
     : ssclient_(std::make_shared<SmartScopesClient>(
-                    std::make_shared<HttpClientQt>(http_reply_timeout),
+                    std::make_shared<HttpClientQt>(ss_config.http_reply_timeout() * 1000),  // need millisecs
                     std::make_shared<JsonCppNode>(), sss_url))
     , refresh_stopped_(false)
     , middleware_(middleware)
     , ss_scope_endpoint_(ss_scope_endpoint)
-    , regular_refresh_timeout_(refresh_rate_in_sec)
-    , next_refresh_timeout_(refresh_rate_in_sec)
+    , regular_refresh_timeout_(ss_config.reg_refresh_rate())
+    , next_refresh_timeout_(ss_config.reg_refresh_rate())
+    , failed_refresh_timeout_(ss_config.reg_refresh_fail_timeout())
     , caching_enabled_(caching_enabled)
 {
     // get remote scopes then start the auto-refresh background thread
@@ -183,14 +182,14 @@
         }
         else
         {
-            next_refresh_timeout_ = c_failed_refresh_timeout;
+            next_refresh_timeout_ = failed_refresh_timeout_;
         }
     }
     catch (std::exception const& e)
     {
         std::cerr << e.what() << std::endl;
         // refresh again soon as get_remote_scopes failed
-        next_refresh_timeout_ = c_failed_refresh_timeout;
+        next_refresh_timeout_ = failed_refresh_timeout_;
         return;
     }
 
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-01-23 11:28:34 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-05-08 12:06:13 +0000
@@ -18,6 +18,11 @@
 
 #include <unity/scopes/internal/zmq_middleware/ZmqConfig.h>
 
+#include <unity/scopes/internal/DfltConfig.h>
+#include <unity/scopes/ScopeExceptions.h>
+
+#include <unistd.h>
+
 using namespace std;
 
 namespace unity
@@ -29,27 +34,43 @@
 namespace internal
 {
 
-const char* ZmqConfig::ZMQ_CONFIG_GROUP = "Zmq";
-
 namespace
 {
-    const string public_dir_str = "EndpointDir.Public";
-    const string private_dir_str = "EndpointDir.Private";
+    const string zmq_config_group = "Zmq";
+    const string public_dir_key = "EndpointDir";
 }
 
 ZmqConfig::ZmqConfig(string const& configfile) :
-    ConfigBase(configfile)
+    ConfigBase(configfile, DFLT_ZMQ_MIDDLEWARE_INI)
 {
-    if (configfile.empty())
-    {
-        public_dir_ = "/tmp";
-        private_dir_ = "/tmp";
-    }
-    else
-    {
-        public_dir_ = get_string(ZMQ_CONFIG_GROUP, public_dir_str);
-        private_dir_ = get_string(ZMQ_CONFIG_GROUP, private_dir_str);
-    }
+    if (!configfile.empty())
+    {
+        public_dir_ = get_optional_string(zmq_config_group, public_dir_key);
+    }
+
+    // Set the endpoint directory if it was not set explicitly.
+    // We look for the XDG_RUNTIME_DIR env variable. If that is not
+    // set, we give up.
+    if (public_dir_.empty())
+    {
+        char* xdg_runtime_dir = secure_getenv("XDG_RUNTIME_DIR");
+        if (!xdg_runtime_dir || *xdg_runtime_dir == '\0')
+        {
+            throw ConfigException("No endpoint directories specified, and XDG_RUNTIME_DIR "
+                                  "environment variable not set");
+        }
+        public_dir_ = string(xdg_runtime_dir) + "/zmq";
+    }
+    private_dir_ = public_dir_ + "/priv";
+
+    const KnownEntries known_entries = {
+                                          {  zmq_config_group,
+                                             {
+                                                public_dir_key
+                                             }
+                                          }
+                                       };
+    check_unknown_entries(known_entries);
 }
 
 ZmqConfig::~ZmqConfig()
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-04-28 06:24:24 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-05-08 12:06:13 +0000
@@ -40,6 +40,7 @@
 #include <unity/UnityExceptions.h>
 
 #include <iostream>  // TODO: remove this once logging is added
+#include <sys/stat.h>
 
 using namespace std;
 
@@ -70,9 +71,22 @@
 char const* scope_category = "Scope";       // scope adapter category name
 char const* registry_category = "Registry"; // registry adapter category name
 
+// Create a directory with mode rwx------t if it doesn't exist yet.
+// We set the sticky bit to prevent the directory from being deleted:
+// if it happens to be under $XDG_RUNTIME_DIR and is not accessed
+// for more than six hours, the system may delete it.
+
+void create_dir(string const& dir)
+{
+    if (mkdir(dir.c_str(), 0700 | S_ISVTX) == -1 && errno != EEXIST)
+    {
+        throw FileException("cannot create endpoint directory " + dir, errno);
+    }
+}
+
 } // namespace
 
-ZmqMiddleware::ZmqMiddleware(string const& server_name, string const& configfile, RuntimeImpl* runtime)
+ZmqMiddleware::ZmqMiddleware(string const& server_name, RuntimeImpl* runtime, string const& configfile)
 try :
     MiddlewareBase(runtime),
     server_name_(server_name),
@@ -82,6 +96,17 @@
     locate_timeout_(2000)  // TODO: get timeout from config
 {
     assert(!server_name.empty());
+
+    // Create the endpoint dirs if they don't exist.
+    try
+    {
+        create_dir(config_.public_dir());
+        create_dir(config_.private_dir());
+    }
+    catch (...)
+    {
+        throw MiddlewareException("cannot initialize zmq middleware for scope " + server_name);
+    }
 }
 catch (zmqpp::exception const& e)
 {
@@ -347,90 +372,63 @@
     return proxy->to_string();
 }
 
-MWRegistryProxy ZmqMiddleware::create_registry_proxy(string const& identity, string const& endpoint)
-{
-    MWRegistryProxy proxy;
-    try
-    {
-        proxy.reset(new ZmqRegistry(this, endpoint, identity, registry_category, twoway_timeout_));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+MWRegistryProxy ZmqMiddleware::registry_proxy()
+{
+    lock_guard<mutex> lock(data_mutex_);
+
+    if (!registry_proxy_)
+    {
+        string r_id = runtime()->registry_identity();  // May be empty, if no registry is configured.
+        if (!r_id.empty())
+        {
+            string r_endp = "ipc://" + config_.public_dir() + "/" + r_id;
+            registry_proxy_.reset(new ZmqRegistry(this, r_endp, r_id, registry_category, twoway_timeout_));
+        }
+    }
+    return registry_proxy_;
+}
+
+MWRegistryProxy ZmqMiddleware::ss_registry_proxy()
+{
+    lock_guard<mutex> lock(data_mutex_);
+
+    if (!ss_registry_proxy_)
+    {
+        string ssr_id = runtime()->ss_registry_identity();  // May be empty, if no registry is configured.
+        if (!ssr_id.empty())
+        {
+            string ssr_endp = "ipc://" + config_.public_dir() + "/" + ssr_id;
+            ss_registry_proxy_.reset(new ZmqRegistry(this, ssr_endp, ssr_id, registry_category, twoway_timeout_));
+        }
+    }
+    return ss_registry_proxy_;
 }
 
 MWScopeProxy ZmqMiddleware::create_scope_proxy(string const& identity)
 {
-    MWScopeProxy proxy;
-    try
-    {
-        string endpoint = "ipc://" + config_.private_dir() + "/" + identity;
-        proxy.reset(new ZmqScope(this, endpoint, identity, scope_category, twoway_timeout_));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+    string endpoint = "ipc://" + config_.private_dir() + "/" + identity;
+    return make_shared<ZmqScope>(this, endpoint, identity, scope_category, twoway_timeout_);
 }
 
 MWScopeProxy ZmqMiddleware::create_scope_proxy(string const& identity, string const& endpoint)
 {
-    MWScopeProxy proxy;
-    try
-    {
-        proxy.reset(new ZmqScope(this, endpoint, identity, scope_category, twoway_timeout_));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+    return make_shared<ZmqScope>(this, endpoint, identity, scope_category, twoway_timeout_);
 }
 
 MWQueryProxy ZmqMiddleware::create_query_proxy(string const& identity, string const& endpoint)
 {
-    MWQueryProxy proxy;
-    try
-    {
-        proxy.reset(new ZmqQuery(this, endpoint, identity, query_category));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+    return make_shared<ZmqQuery>(this, endpoint, identity, query_category);
 }
 
 MWQueryCtrlProxy ZmqMiddleware::create_query_ctrl_proxy(string const& identity, string const& endpoint)
 {
-    MWQueryCtrlProxy proxy;
-    try
-    {
-        proxy.reset(new ZmqQueryCtrl(this, endpoint, identity, ctrl_category));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+    return make_shared<ZmqQueryCtrl>(this, endpoint, identity, ctrl_category);
 }
 
 MWStateReceiverProxy ZmqMiddleware::create_state_receiver_proxy(std::string const& identity)
 {
-    MWStateReceiverProxy proxy;
-    try
-    {
-        proxy.reset(new ZmqStateReceiver(this, "ipc://" + config_.private_dir() + "/" +  server_name_ + state_suffix,
-                                         identity, state_category));
-    }
-    catch (zmqpp::exception const& e)
-    {
-        rethrow_zmq_ex(e);
-    }
-    return proxy;
+    string endpoint = "ipc://" + config_.private_dir() + "/" + server_name_ + state_suffix;
+    return make_shared<ZmqStateReceiver>(this, endpoint, identity, state_category);
 }
 
 MWQueryCtrlProxy ZmqMiddleware::add_query_ctrl_object(QueryCtrlObjectBase::SPtr const& ctrl)
@@ -526,7 +524,7 @@
     try
     {
         shared_ptr<RegistryI> ri(make_shared<RegistryI>(registry));
-        auto adapter = find_adapter(server_name_, runtime()->registry_endpointdir(), registry_category);
+        auto adapter = find_adapter(server_name_, config_.public_dir(), registry_category);
         function<void()> df;
         auto p = safe_add(df, adapter, identity, ri);
         registry->set_disconnect_function(df);
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqObject.cpp'
--- src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-04-17 05:59:48 +0000
+++ src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-05-08 12:06:13 +0000
@@ -47,9 +47,6 @@
 {
     // this mutex protects all members of all ZmqObjectProxies
     std::mutex shared_mutex;
-
-    // There is only one registry proxy, so share it across all ZmqObjectProxies
-    ZmqRegistryProxy shared_reg_proxy = nullptr;
 }
 
 #define MONITOR_ENDPOINT "ipc:///tmp/scopes-monitor"
@@ -217,40 +214,16 @@
     }
     catch (TimeoutException const&)
     {
-        // retrieve the registry proxy if we haven't already done so
-        {
-            lock_guard<mutex> lock(shared_mutex);
-            if (!shared_reg_proxy)
-            {
-                auto runtime = mw_base() ? mw_base()->runtime() : nullptr;
-                if (!runtime)
-                {
-                    throw;
-                }
-
-                // we must do this via lazy initialization as attempting to do this in
-                // the constructor causes a deadlock when accessing runtime methods
-                shared_reg_proxy = dynamic_pointer_cast<ZmqRegistry>(mw_base()->create_registry_proxy(
-                                                                         runtime->registry_identity(),
-                                                                         runtime->registry_endpoint()));
-
-                // this really shouldn't happen but if we do fail to retrieve the
-                // registry proxy, just rethrow the exception
-                if (!shared_reg_proxy)
-                {
-                    throw;
-                }
-            }
-        }
-
-        // if this object is the registry itself, rethrow the exception
-        if (identity() == shared_reg_proxy->identity())
+        auto registry_proxy = mw_base()->registry_proxy();
+
+        // If no registry is configured or if this object is the registry itself, rethrow the exception
+        if (!registry_proxy || identity() == registry_proxy->identity())
         {
             throw;
         }
 
         // rebind
-        ObjectProxy new_proxy = shared_reg_proxy->locate(identity());
+        ObjectProxy new_proxy = registry_proxy->locate(identity());
 
         // update our proxy with the newly received data
         // (we need to first store values in local variables outside of the mutex,
@@ -312,7 +285,7 @@
         // If a request times out, we must trash the corresponding socket, otherwise
         // zmq gets confused: the reply will never be read, so the socket ends up
         // in a bad state.
-        // (removing a socket from the connection pool deletes it, hense closing the socket)
+        // (Removing a socket from the connection pool deletes it, hence closing the socket.)
         pool.remove(endpoint);
         throw TimeoutException("Request timed out after " + std::to_string(timeout) + " milliseconds");
     }
 
=== modified file 'test/gtest/scopes/Activation/Activation_test.cpp'
--- test/gtest/scopes/Activation/Activation_test.cpp	2014-04-15 05:36:38 +0000
+++ test/gtest/scopes/Activation/Activation_test.cpp	2014-05-08 12:06:13 +0000
@@ -513,7 +513,7 @@
 
     RaiiScopeThread(std::string const& scope_id, std::string const& configfile)
         : runtime(Runtime::create_scope_runtime(scope_id, configfile)),
-          scope_thread([this]{ runtime->run_scope(&scope, "/foo"); }) {}
+          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, "/foo"); }) {}
 
     ~RaiiScopeThread()
     {
 
=== modified file 'test/gtest/scopes/Activation/Registry.ini.in'
--- test/gtest/scopes/Activation/Registry.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/Activation/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /unused
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/Activation/Zmq.ini.in'
--- test/gtest/scopes/Activation/Zmq.ini.in	2014-01-14 17:31:16 +0000
+++ test/gtest/scopes/Activation/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
--- test/gtest/scopes/Filters/Filters_test.cpp	2014-04-15 05:36:38 +0000
+++ test/gtest/scopes/Filters/Filters_test.cpp	2014-05-08 12:06:13 +0000
@@ -80,7 +80,7 @@
 
     RaiiScopeThread(std::string const& scope_id, std::string const& configfile)
         : runtime(Runtime::create_scope_runtime(scope_id, configfile)),
-          scope_thread([this]{ runtime->run_scope(&scope, "/foo"); }) {}
+          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, "/foo"); }) {}
 
     ~RaiiScopeThread()
     {
 
=== modified file 'test/gtest/scopes/Filters/Registry.ini.in'
--- test/gtest/scopes/Filters/Registry.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/Filters/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /unused
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/Filters/Zmq.ini.in'
--- test/gtest/scopes/Filters/Zmq.ini.in	2014-01-24 12:51:40 +0000
+++ test/gtest/scopes/Filters/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/Invocation/Invocation_test.cpp'
--- test/gtest/scopes/Invocation/Invocation_test.cpp	2014-05-05 09:21:30 +0000
+++ test/gtest/scopes/Invocation/Invocation_test.cpp	2014-05-08 12:06:13 +0000
@@ -120,10 +120,10 @@
     EXPECT_EQ("", receiver->error_message());
 }
 
-void scope_thread(Runtime::SPtr const& rt)
+void scope_thread(Runtime::SPtr const& rt, string const& runtime_ini_file)
 {
     TestScope scope;
-    rt->run_scope(&scope, "/foo");
+    rt->run_scope(&scope, runtime_ini_file, "/foo");
 }
 
 int main(int argc, char **argv)
@@ -131,7 +131,7 @@
     ::testing::InitGoogleTest(&argc, argv);
 
     Runtime::SPtr srt = move(Runtime::create_scope_runtime("TestScope", "Runtime.ini"));
-    std::thread scope_t(scope_thread, srt);
+    std::thread scope_t(scope_thread, srt, "Runtime.ini");
 
     // Give thread some time to bind to its endpoint, to avoid getting ObjectNotExistException
     // from a synchronous remote call.
 
=== modified file 'test/gtest/scopes/Invocation/Registry.ini.in'
--- test/gtest/scopes/Invocation/Registry.ini.in	2014-04-17 01:36:29 +0000
+++ test/gtest/scopes/Invocation/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /unused
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/Invocation/Zmq.ini.in'
--- test/gtest/scopes/Invocation/Zmq.ini.in	2014-04-17 01:36:29 +0000
+++ test/gtest/scopes/Invocation/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/Registry/RegistryTest.ini.in'
--- test/gtest/scopes/Registry/RegistryTest.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/Registry/RegistryTest.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/RegistryTest
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
 Scope.InstallDir = @CMAKE_CURRENT_BINARY_DIR@/scopes
 OEM.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-05-05 11:20:55 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-05-08 12:06:13 +0000
@@ -80,11 +80,13 @@
     // wait for the registry to become available on middleware
     // FIXME: remove this once we have async queries and can set arbitrary timeout when calling registry
     const int num_retries = 10;
+    bool registry_started = false;
     for (int i = 0; i < num_retries; ++i)
     {
         try
         {
             r->list(); // this will throw if the registry is not yet available on middleware
+            registry_started = true;
             break;
         }
         catch (std::exception const&)
@@ -92,6 +94,7 @@
             sleep(1);
         }
     }
+    ASSERT_TRUE(registry_started);
 
     auto meta = r->get_metadata("testscopeA");
     EXPECT_EQ("testscopeA", meta.scope_id());
 
=== modified file 'test/gtest/scopes/Registry/Runtime.ini.in'
--- test/gtest/scopes/Registry/Runtime.ini.in	2014-04-03 16:50:44 +0000
+++ test/gtest/scopes/Registry/Runtime.ini.in	2014-05-08 12:06:13 +0000
@@ -3,3 +3,4 @@
 Registry.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/RegistryTest.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = @CMAKE_CURRENT_BINARY_DIR@/Zmq.ini
+Smartscopes.Registry.Identity =
 
=== modified file 'test/gtest/scopes/Registry/Zmq.ini.in'
--- test/gtest/scopes/Registry/Zmq.ini.in	2014-04-01 16:58:32 +0000
+++ test/gtest/scopes/Registry/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp'
--- test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-04-14 05:11:28 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-05-08 12:06:13 +0000
@@ -102,6 +102,6 @@
 
     MyScope scope;
     auto runtime = Runtime::create_scope_runtime("testscopeB", rt_config);
-    runtime->run_scope(&scope, scope_config);
+    runtime->run_scope(&scope, rt_config, scope_config);
     return 0;
 }
 
=== modified file 'test/gtest/scopes/Runtime/Registry.ini.in'
--- test/gtest/scopes/Runtime/Registry.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/Runtime/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /unused
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/Runtime/Runtime_test.cpp'
--- test/gtest/scopes/Runtime/Runtime_test.cpp	2014-04-17 07:17:31 +0000
+++ test/gtest/scopes/Runtime/Runtime_test.cpp	2014-05-08 12:06:13 +0000
@@ -382,22 +382,22 @@
     this_thread::sleep_for(chrono::milliseconds(200));
 }
 
-void scope_thread(Runtime::SPtr const& rt)
+void scope_thread(Runtime::SPtr const& rt, string const& runtime_ini_file)
 {
     TestScope scope;
-    rt->run_scope(&scope, "/foo");
+    rt->run_scope(&scope, runtime_ini_file, "/foo");
 }
 
-void pusher_thread(Runtime::SPtr const& rt)
+void pusher_thread(Runtime::SPtr const& rt, string const& runtime_ini_file)
 {
     PusherScope scope;
-    rt->run_scope(&scope, "/foo");
+    rt->run_scope(&scope, runtime_ini_file, "/foo");
 }
 
-void slow_create_thread(Runtime::SPtr const& rt)
+void slow_create_thread(Runtime::SPtr const& rt, string const& runtime_ini_file)
 {
     SlowCreateScope scope;
-    rt->run_scope(&scope, "/foo");
+    rt->run_scope(&scope, runtime_ini_file, "/foo");
 }
 
 int main(int argc, char **argv)
@@ -405,13 +405,13 @@
     ::testing::InitGoogleTest(&argc, argv);
 
     Runtime::SPtr srt = move(Runtime::create_scope_runtime("TestScope", "Runtime.ini"));
-    std::thread scope_t(scope_thread, srt);
+    std::thread scope_t(scope_thread, srt, "Runtime.ini");
 
     Runtime::SPtr prt = move(Runtime::create_scope_runtime("PusherScope", "Runtime.ini"));
-    std::thread pusher_t(pusher_thread, prt);
+    std::thread pusher_t(pusher_thread, prt, "Runtime.ini");
 
     Runtime::SPtr scrt = move(Runtime::create_scope_runtime("SlowCreateScope", "Runtime.ini"));
-    std::thread slow_create_t(slow_create_thread, scrt);
+    std::thread slow_create_t(slow_create_thread, scrt, "Runtime.ini");
 
     // Give threads some time to bind to their endpoints, to avoid getting ObjectNotExistException
     // from a synchronous remote call.
 
=== modified file 'test/gtest/scopes/Runtime/Zmq.ini.in'
--- test/gtest/scopes/Runtime/Zmq.ini.in	2013-11-29 12:20:25 +0000
+++ test/gtest/scopes/Runtime/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp'
--- test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2014-05-08 07:25:37 +0000
+++ test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp	2014-05-08 12:06:13 +0000
@@ -22,6 +22,8 @@
 
 #include <gtest/gtest.h>
 
+#include <scope-api-testconfig.h>
+
 using namespace std;
 using namespace unity;
 using namespace unity::scopes;
@@ -41,22 +43,25 @@
     }
 };
 
+const string TEST_DIR = string(TEST_BUILD_ROOT) + "/gtest/scopes/internal/ConfigBase";
+const string TEST_INI = TEST_DIR + "/Test.ini";
+
 TEST(ConfigBase, basic)
 {
-    MyConfig c("Test.ini");
+    MyConfig c(TEST_INI);
     EXPECT_TRUE(c.parser().get());
 }
 
 TEST(ConfigBase, optional_string)
 {
-    MyConfig c("Test.ini");
+    MyConfig c(TEST_INI);
     EXPECT_EQ("", c.get_optional_string("SomeGroup", "NoSuchKey"));
     EXPECT_EQ("", c.get_optional_string("SomeGroup", "Empty"));
 }
 
 TEST(ConfigBase, non_optional_string)
 {
-    MyConfig c("Test.ini");
+    MyConfig c(TEST_INI);
     try
     {
         c.get_string("SomeGroup", "Empty");
@@ -64,13 +69,13 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal empty value for Empty", e.what());
+        EXPECT_EQ("unity::scopes::ConfigException: \"" + TEST_INI + "\": Illegal empty value for Empty", e.what());
     }
 }
 
 TEST(ConfigBase, middleware)
 {
-    MyConfig c("Test.ini");
+    MyConfig c(TEST_INI);
     EXPECT_EQ("Zmq", c.get_middleware("SomeGroup", "Zmq.Middleware"));
     EXPECT_EQ("REST", c.get_middleware("SomeGroup", "REST.Middleware"));
     try
@@ -80,9 +85,9 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for Zmq.BadMiddleware: \"foo\": "
-                     "legal values are \"Zmq\" and \"REST\"",
-                     e.what());
+        EXPECT_EQ("unity::scopes::ConfigException: \"" + TEST_INI + "\": Illegal value for Zmq.BadMiddleware: \"foo\": "
+                  "legal values are \"Zmq\" and \"REST\"",
+                  e.what());
     }
     try
     {
@@ -91,15 +96,15 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": Illegal value for REST.BadMiddleware: \"bar\": "
-                     "legal values are \"Zmq\" and \"REST\"",
-                     e.what());
+        EXPECT_EQ("unity::scopes::ConfigException: \"" + TEST_INI + "\": Illegal value for REST.BadMiddleware: \"bar\": "
+                  "legal values are \"Zmq\" and \"REST\"",
+                  e.what());
     }
 }
 
 TEST(ConfigBase, throw_ex)
 {
-    MyConfig c("Test.ini");
+    MyConfig c(TEST_INI);
     EXPECT_TRUE(c.parser().get());
 
     try
@@ -108,7 +113,7 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"Test.ini\": error", e.what());
+        EXPECT_EQ("unity::scopes::ConfigException: \"" + TEST_INI + "\": error", e.what());
     }
 }
 
@@ -116,11 +121,22 @@
 {
     try
     {
-        MyConfig c("no_such_file");
+        MyConfig c("wrong_extension.x");
+    }
+    catch (ConfigException const& e)
+    {
+        EXPECT_STREQ("unity::scopes::ConfigException: invalid config file name: \"wrong_extension.x\": "
+                     "missing .ini extension",
+                     e.what());
+    }
+
+    try
+    {
+        MyConfig c("no_such_file.ini");
     }
     catch (FileException const& e)
     {
-        EXPECT_STREQ("unity::FileException: Could not load ini file no_such_file: No such file or directory (errno = 4)",
+        EXPECT_STREQ("unity::FileException: Could not load ini file no_such_file.ini: No such file or directory (errno = 4)",
                      e.what());
     }
 }
 
=== modified file 'test/gtest/scopes/internal/RegistryConfig/Registry.ini.in'
--- test/gtest/scopes/internal/RegistryConfig/Registry.ini.in	2014-05-08 07:25:37 +0000
+++ test/gtest/scopes/internal/RegistryConfig/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp/socket_for_registry
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /SomeDir
 Scoperunner.Path = /SomeAbsolutePath
 
=== modified file 'test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp'
--- test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2014-05-08 07:25:37 +0000
+++ test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp	2014-05-08 12:06:13 +0000
@@ -33,7 +33,6 @@
     RegistryConfig c("Registry", TEST_REGISTRY_PATH);
     EXPECT_EQ("Registry", c.identity());
     EXPECT_EQ("Zmq", c.mw_kind());
-    EXPECT_EQ("ipc:///tmp/socket_for_registry", c.endpoint());
     EXPECT_EQ("Zmq.ini", c.mw_configfile());
 }
 
 
=== modified file 'test/gtest/scopes/internal/RegistryConfig/ScoperunnerRelativePath.ini.in'
--- test/gtest/scopes/internal/RegistryConfig/ScoperunnerRelativePath.ini.in	2013-11-19 02:51:46 +0000
+++ test/gtest/scopes/internal/RegistryConfig/ScoperunnerRelativePath.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,6 @@
 [Registry]
 Middleware = Zmq
 Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp/socket_for_registry
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /SomeDir
 Scoperunner.Path = SomeRelativePath
 
=== modified file 'test/gtest/scopes/internal/ResultReplyObject/Registry.ini.in'
--- test/gtest/scopes/internal/ResultReplyObject/Registry.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/internal/ResultReplyObject/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,7 +1,5 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /unused
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/internal/ResultReplyObject/Zmq.ini.in'
--- test/gtest/scopes/internal/ResultReplyObject/Zmq.ini.in	2014-02-24 14:56:26 +0000
+++ test/gtest/scopes/internal/ResultReplyObject/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2014-02-05 13:08:06 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2014-05-08 12:06:13 +0000
@@ -35,35 +35,6 @@
     EXPECT_EQ("Zmq", c.default_middleware());
 }
 
-TEST(RuntimeConfig, BadRegistryID)
-{
-    try
-    {
-        RuntimeConfig c("BadRegID.ini");
-        FAIL();
-    }
-    catch (ConfigException const& e)
-    {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"BadRegID.ini\": Illegal character in value for "
-                     "Registry.Identity: \"Regi/stry\": identity cannot contain '/'",
-                     e.what());
-    }
-}
-
-TEST(RuntimeConfig, MiddlewareEmpty)
-{
-    try
-    {
-        RuntimeConfig c("MWEmpty.ini");
-        FAIL();
-    }
-    catch (ConfigException const& e)
-    {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"MWEmpty.ini\": Illegal empty value for Default.Middleware",
-                     e.what());
-    }
-}
-
 TEST(RuntimeConfig, BadMiddleware)
 {
     try
 
=== modified file 'test/gtest/scopes/internal/RuntimeImpl/Registry.ini.in'
--- test/gtest/scopes/internal/RuntimeImpl/Registry.ini.in	2014-04-08 08:26:44 +0000
+++ test/gtest/scopes/internal/RuntimeImpl/Registry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,9 +1,7 @@
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/socket_for_registry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scoperunner.Path = /SomePath
-Scope.ConfigDir = /tmp
+Scope.InstallDir = /tmp
 Scope.InstallDir = /tmp
 Click.InstallDir = /unused
 
=== modified file 'test/gtest/scopes/internal/RuntimeImpl/Zmq.ini.in'
--- test/gtest/scopes/internal/RuntimeImpl/Zmq.ini.in	2013-11-29 12:20:25 +0000
+++ test/gtest/scopes/internal/RuntimeImpl/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-04-15 04:53:44 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp	2014-05-08 12:06:13 +0000
@@ -37,7 +37,7 @@
 TEST(ScopeMetadataImpl, basic)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini");
 
     unique_ptr<ScopeMetadataImpl> mi(new ScopeMetadataImpl(&mw));
     mi->set_scope_id("scope_id");
@@ -231,7 +231,7 @@
 TEST(ScopeMetadataImpl, serialize)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini");
 
     unique_ptr<ScopeMetadataImpl> mi(new ScopeMetadataImpl(&mw));
     mi->set_scope_id("scope_id");
@@ -280,7 +280,7 @@
 TEST(ScopeMetadataImpl, serialize_exceptions)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini");
 
     ScopeMetadataImpl mi(&mw);
     try
@@ -347,7 +347,7 @@
 TEST(ScopeMetadataImpl, deserialize_exceptions)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini");
 
     VariantMap m;
     try
 
=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini.in'
--- test/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ test/gtest/scopes/internal/ScopeMetadataImpl/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/SSRegistryTest.ini.in'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/SSRegistryTest.ini.in	2014-02-04 12:31:29 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/SSRegistryTest.ini.in	2014-05-08 12:06:13 +0000
@@ -1,10 +1,5 @@
-[Runtime]
-Registry.Identity = SSRegistryTest
-
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/SSRegistryTest
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /tmp
 Scoperunner.Path = /tmp
 
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/Zmq.ini.in'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/Zmq.ini.in	2014-01-17 09:59:38 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-04-16 07:04:34 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-05-08 12:06:13 +0000
@@ -61,12 +61,14 @@
         std::string mw_kind = reg_conf.mw_kind();
         std::string mw_configfile = reg_conf.mw_configfile();
 
+        SSConfig ss_config(reg_rt_->ss_configfile());
+
         // Get middleware handles from runtimes
         reg_mw_ = reg_rt_->factory()->find(reg_id_, mw_kind);
         scope_mw_ = scope_rt_->factory()->create(scope_id_, mw_kind, mw_configfile);
 
         // Instantiate a SS registry and scope objects
-        reg_ = SSRegistryObject::SPtr(new SSRegistryObject(reg_mw_, scope_mw_->get_scope_endpoint(), 20000, 60,
+        reg_ = SSRegistryObject::SPtr(new SSRegistryObject(reg_mw_, ss_config, scope_mw_->get_scope_endpoint(),
                                                            "http://127.0.0.1:" + std::to_string(server_.port_), false));
         scope_ = SSScopeObject::UPtr(new SSScopeObject(scope_id_, scope_mw_, reg_));
 
@@ -119,7 +121,7 @@
     EXPECT_THROW(reg_->get_metadata("dummy.scope.3"), NotFoundException);
 
     // locate should throw (via mw)
-    MWRegistryProxy mw_reg = reg_mw_->create_registry_proxy(reg_id_, reg_mw_->get_scope_endpoint());
+    MWRegistryProxy mw_reg = reg_mw_->registry_proxy();
     EXPECT_THROW(mw_reg->locate("Dummy Demo Scope"), RegistryException);
 
     // list scopes (via mw)
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-04-28 06:24:24 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp	2014-05-08 12:06:13 +0000
@@ -18,6 +18,7 @@
 
 #include <unity/scopes/internal/zmq_middleware/ObjectAdapter.h>
 
+#include <scope-api-testconfig.h>
 #include <scopes/internal/zmq_middleware/capnproto/Message.capnp.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/zmq_middleware/ServantBase.h>
@@ -31,7 +32,6 @@
 #include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
 #include <capnp/serialize.h>
 #include <gtest/gtest.h>
-#include <scope-api-testconfig.h>
 
 using namespace std;
 using namespace unity;
@@ -54,8 +54,8 @@
 
 TEST(ObjectAdapter, basic)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     // Instantiate and destroy oneway and twoway adapters with single and multiple threads.
     {
@@ -133,8 +133,8 @@
 
 TEST(ObjectAdapter, state_change)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     {
         wait();
@@ -228,8 +228,8 @@
 
 TEST(ObjectAdapter, wait_for_shutdown)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     // Start the adapter and call shutdown() from a different thread after a delay, and wait for the
     // shutdown to complete. We check that the shutdown happens after at least the delay that was specified,
@@ -276,7 +276,7 @@
 TEST(ObjectAdapter, add_remove_find)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 5);
@@ -337,8 +337,8 @@
 
 TEST(ObjectAdapter, dispatch_oneway_to_twoway)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -373,8 +373,8 @@
 
 TEST(ObjectAdapter, dispatch_twoway_to_oneway)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Oneway, 1);
@@ -400,8 +400,8 @@
 
 TEST(ObjectAdapter, dispatch_not_exist)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -442,8 +442,8 @@
 
 TEST(ObjectAdapter, bad_header)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     {
         wait();
@@ -503,8 +503,8 @@
 
 TEST(ObjectAdapter, corrupt_header)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     {
         wait();
@@ -563,7 +563,7 @@
 TEST(ObjectAdapter, invoke_ok)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -615,7 +615,7 @@
 TEST(ObjectAdapter, invoke_object_not_exist)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -660,7 +660,7 @@
 TEST(ObjectAdapter, invoke_operation_not_exist)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -780,7 +780,7 @@
 TEST(ObjectAdapter, twoway_threading)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     // Single servant to which we send requests concurrently.
     shared_ptr<CountingServant> o(new CountingServant(100));
@@ -814,7 +814,7 @@
 TEST(ObjectAdapter, oneway_threading)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     // Single servant to which we send requests concurrently.
     shared_ptr<CountingServant> o(new CountingServant(100));
@@ -885,7 +885,7 @@
 TEST(ObjectAdapter, servant_map_destructor)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     {
         wait();
@@ -1056,8 +1056,9 @@
 
         wait(200);  // Give zmq some time to finish the bind.
 
-        ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                         (RuntimeImpl*)0x1);
+        ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                         TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
+
         wait();
         try
         {
@@ -1093,8 +1094,8 @@
 
         wait(200);  // Give zmq some time to finish the bind.
 
-        ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                         (RuntimeImpl*)0x1);
+        ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                         TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
         wait();
         try
         {
@@ -1122,8 +1123,8 @@
 
 TEST(ObjectAdapter, dflt_servant)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
@@ -1177,8 +1178,8 @@
 
 TEST(ObjectAdapter, dflt_servant_exceptions)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini");
 
     wait();
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-05-05 07:14:52 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-05-08 12:06:13 +0000
@@ -96,7 +96,6 @@
     string identity = runtime->registry_identity();
     RegistryConfig c(identity, runtime->registry_configfile());
     string mw_kind = c.mw_kind();
-    string mw_endpoint = c.endpoint();
     string mw_configfile = c.mw_configfile();
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
@@ -120,7 +119,6 @@
     string identity = runtime->registry_identity();
     RegistryConfig c(identity, runtime->registry_configfile());
     string mw_kind = c.mw_kind();
-    string mw_endpoint = c.endpoint();
     string mw_configfile = c.mw_configfile();
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
@@ -170,7 +168,6 @@
     string identity = runtime->registry_identity();
     RegistryConfig c(identity, runtime->registry_configfile());
     string mw_kind = c.mw_kind();
-    string mw_endpoint = c.endpoint();
     string mw_configfile = c.mw_configfile();
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
@@ -223,7 +220,6 @@
     string identity = runtime->registry_identity();
     RegistryConfig c(identity, runtime->registry_configfile());
     string mw_kind = c.mw_kind();
-    string mw_endpoint = c.endpoint();
     string mw_configfile = c.mw_configfile();
 
     MiddlewareBase::SPtr middleware = runtime->factory()->create(identity, mw_kind, mw_configfile);
@@ -316,7 +312,6 @@
     string identity = runtime->registry_identity();
     RegistryConfig c(identity, runtime->registry_configfile());
     string mw_kind = c.mw_kind();
-    string mw_endpoint = c.endpoint();
     string mw_configfile = c.mw_configfile();
     RegistryObject::ScopeExecData dummy_exec_data;
 
@@ -500,7 +495,7 @@
 // test locating the same scope multiple times
 TEST_F(RegistryTest, locate_one)
 {
-    // locate all scopes (hense starting all scope processes)
+    // locate all scopes (hence starting all scope processes)
     for (auto const& scope_id : scope_ids)
     {
         EXPECT_EQ(proxies[scope_id], reg->locate(scope_id));
@@ -603,7 +598,7 @@
 // test removing a scope
 TEST_F(RegistryTest, locate_remove)
 {
-    // locate all scopes (hense starting all scope processes)
+    // locate all scopes (hence starting all scope processes)
     for (auto const& scope_id : scope_ids)
     {
         EXPECT_EQ(proxies[scope_id], reg->locate(scope_id));
@@ -612,7 +607,7 @@
     // check that 6 new processes were started
     EXPECT_EQ(6, process_count());
 
-    // remove a scope (hense killing the process)
+    // remove a scope (hence killing the process)
     EXPECT_TRUE(reg->remove_local_scope(scope_ids[0]));
 
     // check that we now have 5 scopes running
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/TestRegistry.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/TestRegistry.ini.in	2014-03-17 06:45:44 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/TestRegistry.ini.in	2014-05-08 12:06:13 +0000
@@ -1,10 +1,5 @@
-[Runtime]
-Registry.Identity = TestRegistry
-
 [Registry]
 Middleware = Zmq
-Zmq.Endpoint = ipc:///tmp/TestRegistry
-Zmq.EndpointDir = /tmp
 Zmq.ConfigFile = Zmq.ini
 Scope.InstallDir = /tmp
 Scoperunner.Path = @CMAKE_BINARY_DIR@/scoperunner/scoperunner
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/Zmq.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp	2014-01-22 03:29:48 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp	2014-05-08 12:06:13 +0000
@@ -93,8 +93,8 @@
 
 TEST(ServantBase, success)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini");
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
     Current current;
     current.op_name = "op";
@@ -110,8 +110,8 @@
 
 TEST(ServantBase, ping)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini");
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
     Current current;
     current.op_name = "ping";
@@ -127,8 +127,8 @@
 
 TEST(ServantBase, exceptions)
 {
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini");
     ObjectAdapter a(mw, "testscope", "ipc://testscope", RequestMode::Twoway, 1);
     Current current;
     current.op_name = "op";
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ServantBase/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini.in'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini.in	2013-11-28 00:27:48 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini.in	2014-05-08 12:06:13 +0000
@@ -1,3 +1,2 @@
 [Zmq]
-EndpointDir.Public = /tmp
-EndpointDir.Private = /tmp
+EndpointDir = /tmp
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2014-04-09 07:29:37 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2014-05-08 12:06:13 +0000
@@ -18,13 +18,13 @@
 
 #include <unity/scopes/internal/zmq_middleware/ZmqMiddleware.h>
 
+#include <scope-api-testconfig.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/ScopeExceptions.h>
 
 #include <gtest/gtest.h>
-#include <scope-api-testconfig.h>
 
 using namespace std;
 using namespace unity::scopes;
@@ -35,9 +35,8 @@
 
 TEST(ZmqMiddleware, basic)
 {
-    ZmqMiddleware mw("testscope",
-                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini");
     mw.start();
     sleep(1);
     mw.stop();
@@ -46,7 +45,7 @@
 TEST(ZmqMiddleware, string_to_proxy)
 {
     auto rt = RuntimeImpl::create("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/RuntimeImpl/Runtime.ini");
-    ZmqMiddleware mw("testscope", TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini", rt.get());
+    ZmqMiddleware mw("testscope", rt.get(), TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini");
 
     ObjectProxy p;
     ScopeProxy sp;
@@ -84,9 +83,8 @@
 
 TEST(ZmqMiddleware, string_to_proxy_ex)
 {
-    ZmqMiddleware mw("testscope",
-                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini",
-                     (RuntimeImpl*)0x1);
+    ZmqMiddleware mw("testscope", (RuntimeImpl*)0x1,
+                     TEST_BUILD_ROOT "/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Zmq.ini");
 
     try
     {
 
=== modified file 'test/whitespace/check_whitespace.py'
--- test/whitespace/check_whitespace.py	2014-04-04 07:34:33 +0000
+++ test/whitespace/check_whitespace.py	2014-05-08 12:06:13 +0000
@@ -60,7 +60,7 @@
         for lino, line in enumerate(ifile, start=1):
             if whitespace_pat.match(line) or tab_indent_pat.match(line):
                 errors.append(lino)
-            if line == "\n":
+            if line == "\n" and lino != 1:  # Don't complain about empty file with only a single line
                 newlines_at_end += 1
             else:
                 newlines_at_end = 0
 
=== modified file 'unity-scopes.map'
--- unity-scopes.map	2014-04-10 14:39:05 +0000
+++ unity-scopes.map	2014-05-08 12:06:13 +0000
@@ -20,6 +20,7 @@
         unity::scopes::internal::ScopeMetadataImpl::*;
         unity::scopes::internal::ScopeObject::*;
         unity::scopes::internal::StateReceiverObject::*;
+        unity::scopes::internal::smartscopes::SSConfig::*;
         unity::scopes::internal::smartscopes::SSRegistryObject::*;
         unity::scopes::internal::smartscopes::SSScopeObject::*;
     };