Merge lp:~thomas-voss/location-service/remove-obsolete-code-and-targets into lp:location-service

[Thomas Voß]

First wave of removals of obsolete code and targets.

First wave of removals of obsolete code and targets.

[Simon Fels (morphis)]

LGTM

review: Approve

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-05-20 09:45:02 +0000
+++ examples/CMakeLists.txt	2016-07-13 14:07:39 +0000
@@ -1,5 +1,3 @@
-add_subdirectory(service)
-
 install(
   DIRECTORY standalone
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}/examples)
\ No newline at end of file
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}/examples)

=== removed directory 'examples/service'
=== removed file 'examples/service/CMakeLists.txt'
--- examples/service/CMakeLists.txt	2014-06-02 10:00:07 +0000
+++ examples/service/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-message(STATUS ${Boost_LIBRARIES})
-include_directories(
-    ${Boost_INCLUDE_DIRS}
-    ${DBUS_INCLUDE_DIRS}
-    ${DBUS_CPP_INCLUDE_DIRS}
-
-)
-
-link_directories(
-  /tmp/wpsapi-4.7.6_05-linux-x86_64/lib
-)
-
-add_executable(
-    client
-    client.cpp
-)
-
-add_executable(
-    service
-    service.cpp
-)
-
-target_link_libraries(
-    client
-
-    ubuntu-location-service
-
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${Boost_LIBRARIES}
-    ${DBUS_LIBRARIES}
-    ${DBUS_CPP_LDFLAGS}
-)
-
-target_link_libraries(
-    service
-
-    ubuntu-location-service
-
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${Boost_LIBRARIES}
-    ${DBUS_LIBRARIES}
-    ${DBUS_CPP_LDFLAGS}
-)
-
-add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ubuntu-location-service.1"
-    COMMAND ronn --roff --pipe --organization=ubuntu ${CMAKE_CURRENT_SOURCE_DIR}/service.1.ronn > ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-location-service.1
-)
-
-add_custom_target(
-    ubuntu-location-service-man-page
-    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-location-service.1"
-)
-
-install(
-    TARGETS service client
-    DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/examples/
-)
-
-install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-location-service.1
-    DESTINATION share/doc/${CMAKE_PROJECT_NAME}/man
-)

=== removed file 'examples/service/client.cpp'
--- examples/service/client.cpp	2016-06-26 21:17:03 +0000
+++ examples/service/client.cpp	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include "program_options.h"
-
-#include <location/service/stub.h>
-
-#include <core/dbus/resolver.h>
-#include <core/dbus/asio/executor.h>
-
-#include <thread>
-
-namespace dbus = core::dbus;
-
-int main(int argc, char** argv)
-{
-    location::ProgramOptions options;
-
-    options.add("help", "Produces this help message");
-    options.add(
-        "bus", 
-        "The well-known bus to connect to the service upon", 
-        std::string{"session"});
-
-    if (!options.parse_from_command_line_args(argc, argv))
-        return EXIT_FAILURE;
-
-    if (options.value_count_for_key("help") > 0)
-    {
-        options.print_help(std::cout);
-        return EXIT_SUCCESS;
-    }
-
-    static const std::map<std::string, dbus::WellKnownBus> lut = 
-    {
-        {"session", dbus::WellKnownBus::session},
-        {"system", dbus::WellKnownBus::system},
-    };
-
-    dbus::Bus::Ptr bus
-    {
-        new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
-    };
-    bus->install_executor(dbus::asio::make_executor(bus));
-    std::thread t{[bus](){bus->run();}};
-    
-    auto location_service = 
-            dbus::resolve_service_on_bus<location::service::Interface, location::service::Stub>(bus);
-        
-    auto s1 = location_service->create_session_for_criteria(location::Criteria{});
-        
-    s1->updates().position.changed().connect(
-        [&](const location::Update<location::Position>& new_position) {
-            std::cout << "On position updated: " << new_position << std::endl;
-        });
-    s1->updates().velocity.changed().connect(
-        [&](const location::Update<location::Velocity>& new_velocity) {
-            std::cout << "On velocity_changed " << new_velocity << std::endl;
-        });
-    s1->updates().heading.changed().connect(
-        [&](const location::Update<location::Heading>& new_heading) {
-            std::cout << "On heading changed: " << new_heading << std::endl;
-        });
-        
-    s1->updates().position_status = location::service::session::Interface::Updates::Status::enabled;
-    s1->updates().heading_status = location::service::session::Interface::Updates::Status::enabled;
-    s1->updates().velocity_status = location::service::session::Interface::Updates::Status::enabled;
-        
-    if (t.joinable())
-        t.join();
-
-    return EXIT_SUCCESS;
-}

=== removed file 'examples/service/program_options.h'
--- examples/service/program_options.h	2016-06-26 21:17:03 +0000
+++ examples/service/program_options.h	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include <boost/program_options/parsers.hpp>
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/variables_map.hpp>
-
-#include <functional>
-#include <iostream>
-
-namespace location {
-struct ProgramOptions
-{
-    ProgramOptions(bool do_allow_unregistered = true) : allow_unregistered(do_allow_unregistered)
-    {
-    }
-
-    ProgramOptions& add(const char* name, const char* desc)
-    {
-        od.add_options()
-                (name, desc);
-        return *this;
-    }
-
-    template<typename T>
-    ProgramOptions& add(const char* name, const char* desc)
-    {
-        od.add_options()
-                (name, boost::program_options::value<T>(), desc);
-        return *this;
-    }
-    
-    template<typename T>
-    ProgramOptions& add(const char* name, const char* desc, const T& default_value)
-    {
-        od.add_options()
-                (name, boost::program_options::value<T>()->default_value(default_value), desc);
-        return *this;
-    }
-
-    template<typename T>
-    ProgramOptions& add_composed(const char* name, const char* desc)
-    {
-        od.add_options()(
-            name, 
-            boost::program_options::value<T>()->composing(),
-            desc);
-        return *this;
-    }
-
-    bool parse_from_command_line_args(int argc, char** argv)
-    {
-        try
-        {
-            auto parser = boost::program_options::command_line_parser(
-                argc, 
-                argv).options(od);
-            auto parsed = allow_unregistered ? parser.allow_unregistered().run() : parser.run();
-            unrecognized = boost::program_options::collect_unrecognized(
-                parsed.options, 
-                boost::program_options::exclude_positional);
-            boost::program_options::store(parsed, vm);
-        } catch(const std::runtime_error& e)
-        {
-            std::cerr << e.what() << std::endl;
-            return false;
-        }
-
-        return true;
-    }
-
-    template<typename T>
-    T value_for_key(const std::string& key)
-    {
-        return vm[key].as<T>();
-    }
-
-    std::size_t value_count_for_key(const std::string& key)
-    {
-        return vm.count(key);
-    }
-
-    void enumerate_unrecognized_options(const std::function<void(const std::string&)>& enumerator)
-    {
-        for (const std::string& s : unrecognized)
-            enumerator(s);
-    }
-
-    void print_help(std::ostream& out)
-    {
-        out << od;
-    }
-
-    bool allow_unregistered;
-    boost::program_options::options_description od;
-    boost::program_options::variables_map vm;
-    std::vector<std::string> unrecognized;
-};
-
-}

=== removed file 'examples/service/service.1.ronn'
--- examples/service/service.1.ronn	2013-05-28 14:20:45 +0000
+++ examples/service/service.1.ronn	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-ubuntu-location-service(1) -- A location service aggregating position/velocity/heading updates and exporting them over dbus.
-============================================================================================================================
-
-## SYNOPSIS
-`ubuntu-location-service` `--bus` <bus> `--provider` <provider> [`--provider` <provider>] [provider specific options] [logging options]
-
-## DESCRIPTION
-A location service aggregating position/velocity/heading updates and exporting them over dbus.
-
-## OPTIONS
-These options control which bus the service is exposed upon and which providers are instantiated:
-
-  * `--bus`=<bus>:
-  Specify the bus that the service should be exposed upon, valid values are "session" or "system".
-  
-  * `--provider`=<provider>:
-  Specify the provider that should be instantiated and configured for this service instance.
-  Valid values are: geoclue::Provider, gps::Provider and skyhook::Provider.
-    
-These options control the behavior of the geoclue provider:
-
-  * `--geoclue::Provider::name`=<name>:
-  The name of the provider on the bus.
-  
-  * `--geoclue::Provider::path`=<path>:
-  The object path of the provider on the bus.
-  
-These options control the behavior of the Skyhook provider:
-
-  * `--skyhook::Provider::username`=<username>:
-  Username for authenicating with the Skyhook service.
-  
-  * `--skyhook::Provider::realm`=<realm>:
-  Realm for authenticating with the Skyhook service.
-  
-  * `--skyhook::Provider::period`=<period>:
-  Delay between updates in [ms].
-  
-These options control the logging behavior of the service:
-
-  * `--logtostderr`=<boolean, default: false>:
-  Log messages to stderr instead of logfiles, defaults to false.
-  
-  * `--stderrthreshold`=<threshold, default: 2>:
-  Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively. Defa
-
-  * `--minloglevel`=<level, default: 0>:
-  Log messages at or above this level. Again, the numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
-  
-  * `--log_dir`=<path, default: "">:
-  If specified, logfiles are written into this directory instead of the default logging directory.
-
-  * `--v`=<level, default: 0>:
-  Show all VLOG(m) messages for m less or equal the value of this flag.
-
-## EXAMPLES
-
-Starting the service with a gps and a skyhook provider, exposing it on the system bus:
-    $ /usr/bin/ubuntu-location-service/examples/service
-        --bus system 
-        --provider gps::Provider 
-        --provider skyhook::Provider 
-        --skyhook::Provider::username=a_registered_user_name 
-        --skyhook::Provider::realm=a_registered_realm
-
-A slightly more verbose instance:
-    $ /usr/bin/ubuntu-location-service/examples/service      
-        --bus system
-        --provider gps::Provider 
-        --provider skyhook::Provider 
-        --skyhook::Provider::username=a_registered_user_name
-        --skyhook::Provider::realm=a_registered_realm
-        --logtostderr=true
-        --v=5
-
-## COPYRIGHT
-
-Ubuntu Location Service is Copyright (C) 2013 Canonical Ltd.

=== removed file 'examples/service/service.cpp'
--- examples/service/service.cpp	2016-06-26 21:17:03 +0000
+++ examples/service/service.cpp	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include "program_options.h"
-
-#include <location/provider_factory.h>
-#include <location/boost_ptree_settings.h>
-
-#include <location/service/default_configuration.h>
-#include <location/service/implementation.h>
-
-#include <core/dbus/announcer.h>
-#include <core/dbus/asio/executor.h>
-
-#include <thread>
-
-namespace dbus = core::dbus;
-
-namespace
-{
-struct NullReporter : public location::service::Harvester::Reporter
-{
-    NullReporter() = default;
-
-    /** @brief Tell the reporter that it should start operating. */
-    void start() override
-    {
-    }
-
-    /** @brief Tell the reporter to shut down its operation. */
-    void stop()
-    {
-    }
-
-    /**
-     * @brief Triggers the reporter to send off the information.
-     */
-    void report(const location::Update<location::Position>&,
-                const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>&,
-                const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>&)
-    {
-    }
-};
-}
-
-int main(int argc, char** argv)
-{
-    location::ProgramOptions options;
-
-    options.add("help", "Produces this help message");
-    options.add(
-        "bus", 
-        "The well-known bus to announce the service upon", 
-        std::string{"session"});
-    options.add(
-        "config-file",
-        "The configuration we should read from/write to",
-        std::string{"/var/run/ubuntu-location-service/config.ini"});
-    options.add_composed<std::vector<std::string>>(
-        "provider", 
-        "The providers that should be added to the engine");
-
-    if (!options.parse_from_command_line_args(argc, argv))
-        return EXIT_FAILURE;
-
-    if (options.value_count_for_key("help") > 0)
-    {
-        options.print_help(std::cout);
-        return EXIT_SUCCESS;
-    }
-    
-    if (options.value_count_for_key("provider") == 0)
-    {
-        std::cout << "A set of providers need to be specified. The following providers are known:" << std::endl;
-        location::ProviderFactory::instance().enumerate(
-            [](const std::string& name, const location::ProviderFactory::Factory&)
-            {
-                std::cout << "\t" << name << std::endl;
-            });
-        return EXIT_FAILURE;
-    }
-
-    auto selected_providers = options.value_for_key<std::vector<std::string>>("provider");
-
-    std::map<std::string, location::ProviderFactory::Configuration> config_lut;
-
-    location::service::DefaultConfiguration config;
-    auto settings = std::make_shared<location::BoostPtreeSettings>(options.value_for_key<std::string>("config-file"));
-    auto engine = config.the_engine(std::set<location::Provider::Ptr>{}, config.the_provider_selection_policy(), settings);
-
-    for (const std::string& provider : selected_providers)
-    {
-        std::cout << "Instantiating and configuring: " << provider << std::endl;
-        options.enumerate_unrecognized_options(
-            [&config_lut, provider](const std::string& s)
-            {
-                std::stringstream in(s);
-                std::string key, value;
-                
-                std::getline(in, key, '=');
-                std::getline(in, value, '=');
-                
-                std::size_t pos = key.find(provider);
-                if (pos == std::string::npos)
-                    return;
-                static const std::string option_marker{"--"};
-                static const std::string scope_separator{"::"};
-                key = key.erase(key.find_first_of(option_marker), option_marker.size()); 
-                key = key.erase(key.find_first_of(provider), provider.size());
-                key = key.erase(key.find_first_of(scope_separator), scope_separator.size()); 
-                
-                std::cout << "\t" << key << " -> " << value << std::endl;
-
-                config_lut[provider].put(key, value);
-            });
-
-        try
-        {
-            auto result = std::async(std::launch::async, [provider, config_lut, engine] {
-                return location::ProviderFactory::instance().create_provider_for_name_with_config(
-                    provider,
-                    config_lut.at(provider),
-                    [engine](location::Provider::Ptr provider)
-                    {
-                        engine->add_provider(provider);
-                    });
-            });
-        } catch(const std::runtime_error& e)
-        {
-            std::cerr << "Exception instantiating provider: " << e.what() << " ... Aborting now." << std::endl;
-            return EXIT_FAILURE;
-        }
-    }
-    
-    static const std::map<std::string, dbus::WellKnownBus> lut = 
-    {
-        {"session", dbus::WellKnownBus::session},
-        {"system", dbus::WellKnownBus::system},
-    };
-
-    dbus::Bus::Ptr incoming
-    {
-        new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
-    };
-    incoming->install_executor(dbus::asio::make_executor(incoming));
-
-    dbus::Bus::Ptr outgoing
-    {
-        new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
-    };
-    outgoing->install_executor(dbus::asio::make_executor(outgoing));
-
-    location::service::Implementation::Configuration configuration
-    {
-        incoming,
-        outgoing,
-        engine,
-        config.the_permission_manager(incoming),
-        location::service::Harvester::Configuration
-        {
-            com::ubuntu::location::connectivity::platform_default_manager(),
-            std::make_shared<NullReporter>()
-        }
-    };
-
-    auto location_service = std::make_shared<location::service::Implementation>(configuration);
-    
-    std::thread t1{[incoming](){incoming->run();}};
-    std::thread t2{[outgoing](){outgoing->run();}};
-    
-    if (t1.joinable())
-        t1.join();
-
-    if (t2.joinable())
-        t2.join();
-
-    return EXIT_SUCCESS;
-}

=== removed file 'examples/service/service.md'
--- examples/service/service.md	2013-05-28 14:20:45 +0000
+++ examples/service/service.md	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-ubuntu-location-service(2) -- A location service aggregating position/velocity/heading updates and exporting them over dbus.
-============================================================================================================================
-
-## SYNOPSIS
-
-`ubuntu-location-service` `--bus` <well known bus name> `--provider` <provider> [`--provider` <provider>] [provider specific options]
-
-## DESCRIPTION
-
-A location service aggregating position/velocity/heading updates and exporting them over dbus.
-
-## OPTIONS
-
-These options control which bus the service is exposed upon and which providers are instantiated:
-
-  * `--bus`=<bus>:
-  Specify the bus that the service should be exposed upon, valid values are "session" or "system".
-  
-  * `--provider`=<provider>:
-  Specify the provider that should be instantiated and configured for this service instance.
-  Valid values are: geoclue::Provider, gps::Provider and skyhook::Provider.
-    
-These options control the behavior of the geoclue provider:
-
-  * `--geoclue::Provider::name`=<name>:
-  The name of the provider on the bus.
-  
-  * `--geoclue::Provider::path`=<path>:
-  The object path of the provider on the bus.
-  
-These options control the behavior of the Skyhook provider:
-
-  * `--skyhook::Provider::username`=<username>:
-  Username for authenicating with the Skyhook service.
-  
-  * `--skyhook::Provider::realm`=<realm>:
-  Realm for authenticating with the Skyhook service.
-  
-  * `--skyhook::Provider::period`=<period>:
-  Delay between updates in [ms].
-  
-These options control the logging behavior of the service:
-
-  * `--logtostderr`=<boolean, default: false>:
-  Log messages to stderr instead of logfiles, defaults to false.
-  
-  * `--stderrthreshold`=<threshold, default: 2>:
-  Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively. Defa
-
-  * `--minloglevel`=<level, default: 0>:
-  Log messages at or above this level. Again, the numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
-  
-  * `--log_dir`=<path, default: "">:
-  If specified, logfiles are written into this directory instead of the default logging directory.
-
-  * `--v`=<level, default: 0>:
-  Show all VLOG(m) messages for m less or equal the value of this flag.
-
-## EXAMPLES
-
-Starting the service with a gps and a skyhook provider, exposing it on the system bus:
-    $ /usr/bin/ubuntu-location-service/examples/service
-        --bus system 
-        --provider gps::Provider 
-        --provider skyhook::Provider 
-        --skyhook::Provider::username=ut_testing 
-        --skyhook::Provider::realm=ut_testing.com
-
-A slightly more verbose instance:
-    $ /usr/bin/ubuntu-location-service/examples/service 
-      --logtostderr=true
-      --v=5
-      --bus system
-      --provider gps::Provider 
-      --provider skyhook::Provider 
-      --skyhook::Provider::username=ut_testing 
-      --skyhook::Provider::realm=ut_testing.com
-
-## COPYRIGHT
-
-Ubuntu Location Service is Copyright (C) 2012 Canonical Ltd.

=== removed file 'examples/service/ubuntu-location-service.1'
--- examples/service/ubuntu-location-service.1	2013-08-29 09:21:07 +0000
+++ examples/service/ubuntu-location-service.1	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "UBUNTU\-LOCATION\-SERVICE" "2" "May 2013" "ubuntu" ""
-.
-.SH "NAME"
-\fBubuntu\-location\-service\fR \- A location service aggregating position/velocity/heading updates and exporting them over dbus\.
-.
-.SH "SYNOPSIS"
-\fBubuntu\-location\-service\fR \fB\-\-bus\fR \fIwell known bus name\fR \fB\-\-provider\fR \fIprovider\fR [\fB\-\-provider\fR \fIprovider\fR] [provider specific options]
-.
-.SH "DESCRIPTION"
-A location service aggregating position/velocity/heading updates and exporting them over dbus\.
-.
-.SH "OPTIONS"
-These options control which bus the service is exposed upon and which providers are instantiated:
-.
-.TP
-\fB\-\-bus\fR=\fIbus\fR
-Specify the bus that the service should be exposed upon, valid values are "session" or "system"\.
-.
-.TP
-\fB\-\-provider\fR=\fIprovider\fR
-Specify the provider that should be instantiated and configured for this service instance\. Valid values are: geoclue::Provider, gps::Provider and skyhook::Provider\.
-.
-.P
-These options control the behavior of the geoclue provider:
-.
-.TP
-\fB\-\-geoclue::Provider::name\fR=\fIname\fR
-The name of the provider on the bus\.
-.
-.TP
-\fB\-\-geoclue::Provider::path\fR=\fIpath\fR
-The object path of the provider on the bus\.
-.
-.P
-These options control the behavior of the Skyhook provider:
-.
-.TP
-\fB\-\-skyhook::Provider::username\fR=\fIusername\fR
-Username for authenicating with the Skyhook service\.
-.
-.TP
-\fB\-\-skyhook::Provider::realm\fR=\fIrealm\fR
-Realm for authenticating with the Skyhook service\.
-.
-.TP
-\fB\-\-skyhook::Provider::period\fR=\fIperiod\fR
-Delay between updates in [ms]\.
-.
-.P
-These options control the logging behavior of the service:
-.
-.TP
-\fB\-\-logtostderr\fR=<boolean, default: false>
-Log messages to stderr instead of logfiles, defaults to false\.
-.
-.TP
-\fB\-\-stderrthreshold\fR=<threshold, default: 2>
-Copy log messages at or above this level to stderr in addition to logfiles\. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively\. Defa
-.
-.TP
-\fB\-\-minloglevel\fR=<level, default: 0>
-Log messages at or above this level\. Again, the numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively\.
-.
-.TP
-\fB\-\-log_dir\fR=<path, default: "">
-If specified, logfiles are written into this directory instead of the default logging directory\.
-.
-.TP
-\fB\-\-v\fR=<level, default: 0>
-Show all VLOG(m) messages for m less or equal the value of this flag\.
-.
-.SH "EXAMPLES"
-Starting the service with a gps and a skyhook provider, exposing it on the system bus:
-.
-.IP "" 4
-.
-.nf
-
-$ /usr/bin/ubuntu\-location\-service/examples/service
-    \-\-bus system
-    \-\-provider gps::Provider
-    \-\-provider skyhook::Provider
-    \-\-skyhook::Provider::username=ut_testing
-    \-\-skyhook::Provider::realm=ut_testing\.com
-.
-.fi
-.
-.IP "" 0
-.
-.P
-A slightly more verbose instance:
-.
-.IP "" 4
-.
-.nf
-
-$ /usr/bin/ubuntu\-location\-service/examples/service
-  \-\-logtostderr=true
-  \-\-v=5
-  \-\-bus system
-  \-\-provider gps::Provider
-  \-\-provider skyhook::Provider
-  \-\-skyhook::Provider::username=ut_testing
-  \-\-skyhook::Provider::realm=ut_testing\.com
-.
-.fi
-.
-.IP "" 0
-.
-.SH "COPYRIGHT"
-Ubuntu Location Service is Copyright (C) 2012 Canonical Ltd\.

=== modified file 'include/location/position.h'
--- include/location/position.h	2016-06-26 21:17:03 +0000
+++ include/location/position.h	2016-07-13 14:07:39 +0000
@@ -59,6 +59,7 @@
 };
 
 std::ostream& operator<<(std::ostream& out, const Position& position);
+std::istream& operator>>(std::istream& in, Position& position);
 
 units::Quantity<units::Length> haversine_distance(const Position& p1, const Position& p2);
 }

=== modified file 'include/location/service.h'
--- include/location/service.h	2016-06-28 11:53:34 +0000
+++ include/location/service.h	2016-07-13 14:07:39 +0000
@@ -21,6 +21,7 @@
 #include <location/space_vehicle.h>
 #include <location/heading.h>
 #include <location/position.h>
+#include <location/provider.h>
 #include <location/velocity.h>
 #include <location/update.h>
 
@@ -138,6 +139,11 @@
     virtual core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles() = 0;
 
     /**
+     * @brief add_provider installs provider to the underlying location::Engine.
+     */
+    virtual void add_provider(const Provider::Ptr& provider) = 0;
+
+    /**
      * @brief Starts a new session for the given criteria
      * @throw std::runtime_error in case of errors.
      * @param criteria The client's requirements in terms of accuraccy and functionality

=== modified file 'src/location/CMakeLists.txt'
--- src/location/CMakeLists.txt	2016-06-30 09:13:21 +0000
+++ src/location/CMakeLists.txt	2016-07-13 14:07:39 +0000
@@ -2,12 +2,10 @@
   add_definitions(-DLOCATION_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
 endif()
 
-set(ICHNAEA_REPORTER_SRCS service/ichnaea_reporter.cpp)
-
 add_subdirectory(providers)
 
 configure_file(
-  service/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/service/config.h @ONLY
+  config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY
 )
 
 include_directories(${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})
@@ -24,7 +22,6 @@
   criteria.cpp
   engine.cpp
   fusion_provider.cpp
-  init_and_shutdown.cpp
   position.cpp
   provider.cpp
   provider_factory.cpp
@@ -61,6 +58,8 @@
 
   cmds/list.h
   cmds/list.cpp
+  cmds/monitor.h
+  cmds/monitor.cpp
   cmds/provider.h
   cmds/provider.cpp
   cmds/run.h
@@ -86,33 +85,11 @@
   dbus/stub/session.h
   dbus/stub/session.cpp
 
-  service/default_configuration.cpp
-  service/default_permission_manager.cpp
-  service/harvester.cpp
-  service/demultiplexing_reporter.h
-  service/demultiplexing_reporter.cpp
-  service/runtime.cpp
-  service/runtime_tests.h
-  service/runtime_tests.cpp
-  service/state.cpp
-  service/trust_store_permission_manager.cpp
-
-  service/implementation.cpp
-  service/skeleton.cpp
-  service/stub.cpp
-
-  service/session/implementation.cpp
-  service/session/interface.cpp
-  service/session/skeleton.cpp
-  service/session/stub.cpp
-
   providers/config.cpp
 
   providers/remote/provider.cpp
   providers/remote/skeleton.cpp
   providers/remote/stub.cpp
-
-  ${ICHNAEA_REPORTER_SRCS}
 )
 
 add_library(
@@ -195,36 +172,6 @@
   DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
-add_library(
-  ubuntu-location-service-provider-daemon
-
-  service/provider_daemon.cpp
-)
-
-add_library(
-  ubuntu-location-service-daemon
-
-  service/daemon.cpp
-)
-
-add_executable(
-  ubuntu-location-service-providerd
-
-  service/provider_daemon_main.cpp
-)
-
-add_executable(
-  ubuntu-location-serviced
-
-  service/daemon_main.cpp
-)
-
-add_executable(
-  ubuntu-location-serviced-cli
-
-  service/daemon_cli_main.cpp
-)
-
 add_executable(
   locationd
 
@@ -232,86 +179,11 @@
 )
 
 target_link_libraries(
-  ubuntu-location-service-provider-daemon
-
-  ubuntu-location-service
-)
-
-target_link_libraries(
-  ubuntu-location-service-daemon
-
-  ubuntu-location-service
-)
-
-target_link_libraries(
-  ubuntu-location-service-providerd
-
-  ubuntu-location-service-provider-daemon
-
-  ${ENABLED_PROVIDER_TARGETS}
-
-  ${Boost_LIBRARIES}
-  ${DBUS_LIBRARIES}
-  ${DBUS_CPP_LIBRARIES}
-  ${GLog_LIBRARY}
-  ${GFlags_LIBRARY}
-)
-
-target_link_libraries(
-  ubuntu-location-serviced
-
-  ubuntu-location-service-daemon
-
-  ${ENABLED_PROVIDER_TARGETS}
-
-  ${Boost_LIBRARIES}
-  ${DBUS_LIBRARIES}
-  ${DBUS_CPP_LIBRARIES}
-  ${GLog_LIBRARY}
-  ${GFlags_LIBRARY}
-)
-
-target_link_libraries(
-  ubuntu-location-serviced-cli
-
-  ubuntu-location-service-daemon
-
-  ${ENABLED_PROVIDER_TARGETS}
-
-  ${Boost_LIBRARIES}
-  ${DBUS_LIBRARIES}
-  ${DBUS_CPP_LIBRARIES}
-  ${GLog_LIBRARY}
-  ${GFlags_LIBRARY}
-)
-
-target_link_libraries(
   locationd
 
   ubuntu-location-service
 
   ${ENABLED_PROVIDER_TARGETS}
-
-#  ${Boost_LIBRARIES}
-#  ${DBUS_LIBRARIES}
-#  ${DBUS_CPP_LIBRARIES}
-#  ${GLog_LIBRARY}
-#  ${GFlags_LIBRARY}
-)
-
-install(
-  TARGETS ubuntu-location-service-providerd
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-install(
-  TARGETS ubuntu-location-serviced
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-install(
-  TARGETS ubuntu-location-serviced-cli
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
 install(

=== added file 'src/location/cmds/monitor.cpp'
--- src/location/cmds/monitor.cpp	1970-01-01 00:00:00 +0000
+++ src/location/cmds/monitor.cpp	2016-07-13 14:07:39 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2016 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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: Thomas Voß <[e-mail]>
+ *
+ */
+
+#include <location/cmds/monitor.h>
+
+#include <location/criteria.h>
+#include <location/dbus/stub/service.h>
+#include <location/runtime.h>
+#include <location/util/well_known_bus.h>
+
+#include <core/dbus/asio/executor.h>
+#include <core/posix/signal.h>
+
+#include <type_traits>
+
+namespace cli = location::util::cli;
+
+namespace
+{
+struct Retry
+{
+    template<unsigned int retry_count, typename Operation>
+    static auto times(const Operation& op) -> typename std::result_of<Operation>::type
+    {
+        for (unsigned int count = 0; count < retry_count; count++)
+            try { return op(); }
+            catch(...) {}
+
+        throw std::runtime_error{"Operation failed"};
+    }
+};
+}
+
+location::cmds::Monitor::PrintingDelegate::PrintingDelegate(std::ostream& out) : out{out}
+{
+}
+
+void location::cmds::Monitor::PrintingDelegate::on_new_position(const Update<Position>& pos)
+{
+    out << pos << std::endl;
+}
+
+void location::cmds::Monitor::PrintingDelegate::on_new_heading(const Update<Heading>& heading)
+{
+    out << heading << std::endl;
+}
+
+void location::cmds::Monitor::PrintingDelegate::on_new_velocity(const Update<Velocity>& velocity)
+{
+    out << velocity << std::endl;
+}
+
+location::cmds::Monitor::Monitor(const std::shared_ptr<Delegate>& delegate)
+    : CommandWithFlagsAndAction{cli::Name{"monitor"}, cli::Usage{"monitor"}, cli::Description{"monitors the daemon"}},
+      delegate{delegate},
+      bus{core::dbus::WellKnownBus::system}
+{
+    flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
+    action([this](const Context&)
+    {
+        // We exit cleanly for SIGINT and SIGTERM.
+        auto trap = core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_int, core::posix::Signal::sig_term});
+        trap->signal_raised().connect([trap](core::posix::Signal)
+        {
+            trap->stop();
+        });
+
+        auto rt = location::Runtime::create();
+
+        auto conn = std::make_shared<core::dbus::Bus>(bus);
+        conn->install_executor(core::dbus::asio::make_executor(conn, rt->service()));
+
+        rt->start();
+
+        core::dbus::Service::Ptr service = core::dbus::Service::use_service<location::dbus::Service>(conn);
+
+        auto stub = std::make_shared<location::dbus::stub::Service>(conn, service, service->object_for_path(core::dbus::types::ObjectPath{location::dbus::Service::path()}));
+        auto session = stub->create_session_for_criteria(location::Criteria{});
+
+        session->updates().position.changed().connect([this](const location::Update<location::Position>& pos)
+        {
+            Monitor::delegate->on_new_position(pos);
+        });
+
+        session->updates().heading.changed().connect([this](const location::Update<location::Heading>& heading)
+        {
+            Monitor::delegate->on_new_heading(heading);
+        });
+
+        session->updates().velocity.changed().connect([this](const location::Update<location::Velocity>& velocity)
+        {
+            Monitor::delegate->on_new_velocity(velocity);
+        });
+
+        session->updates().position_status = location::Service::Session::Updates::Status::enabled;
+        session->updates().heading_status = location::Service::Session::Updates::Status::enabled;
+        session->updates().velocity_status = location::Service::Session::Updates::Status::enabled;
+
+        trap->run();
+
+        session->updates().position_status = location::Service::Session::Updates::Status::disabled;
+        session->updates().heading_status = location::Service::Session::Updates::Status::disabled;
+        session->updates().velocity_status = location::Service::Session::Updates::Status::disabled;
+
+        conn->stop(); rt->stop();
+
+        return EXIT_SUCCESS;
+    });
+}

=== added file 'src/location/cmds/monitor.h'
--- src/location/cmds/monitor.h	1970-01-01 00:00:00 +0000
+++ src/location/cmds/monitor.h	2016-07-13 14:07:39 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2016 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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: Thomas Voß <[e-mail]>
+ *
+ */
+
+#ifndef LOCATION_CMDS_MONITOR_H_
+#define LOCATION_CMDS_MONITOR_H_
+
+#include <location/heading.h>
+#include <location/optional.h>
+#include <location/position.h>
+#include <location/update.h>
+#include <location/velocity.h>
+
+#include <location/util/cli.h>
+
+#include <location/util/well_known_bus.h>
+
+#include <iosfwd>
+
+namespace location
+{
+namespace cmds
+{
+// Monitor connects to a running locationd instance, monitoring its activity.
+class Monitor : public util::cli::CommandWithFlagsAndAction
+{
+public:
+    // Delegate abstracts handling of incoming updates.
+    class Delegate : public util::DoNotCopyOrMove
+    {
+    public:
+        // on_new_position is invoked for every incoming position update.
+        virtual void on_new_position(const Update<Position>& pos) = 0;
+        // on_new_heading is invoked for every incoming heading update.
+        virtual void on_new_heading(const Update<Heading>& heading) = 0;
+        // on_new_velocity is invoked for every incoming velocity update.
+        virtual void on_new_velocity(const Update<Velocity>& velocity) = 0;
+    };
+
+    // PrintingDelegate implements Delegate, printing updates to the given output stream.
+    class PrintingDelegate : public Delegate
+    {
+    public:
+        // PrintingDelegate initializes a new instance with out.
+        PrintingDelegate(std::ostream& out = std::cout);
+
+        // From Delegate
+        void on_new_position(const Update<Position>& pos) override;
+        void on_new_heading(const Update<Heading>& heading) override;
+        void on_new_velocity(const Update<Velocity>& velocity) override;
+    private:
+        std::ostream& out;
+    };
+
+    // Monitor initializes a new instance.
+    Monitor(const std::shared_ptr<Delegate>& delegate = std::make_shared<PrintingDelegate>());
+
+private:
+    std::shared_ptr<Delegate> delegate; // All updates are forwarded to a delegate.
+    core::dbus::WellKnownBus bus;       // The bus we should connect to.
+};
+}
+}
+
+#endif // LOCATION_CMDS_MONITOR_H_

=== modified file 'src/location/cmds/provider.cpp'
--- src/location/cmds/provider.cpp	2016-06-30 09:15:49 +0000
+++ src/location/cmds/provider.cpp	2016-07-13 14:07:39 +0000
@@ -22,6 +22,7 @@
 #include <location/provider_factory.h>
 #include <location/runtime.h>
 
+#include <location/dbus/stub/service.h>
 #include <location/providers/remote/skeleton.h>
 
 #include <core/dbus/service.h>
@@ -43,14 +44,10 @@
       bus{core::dbus::WellKnownBus::system}
 {
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
-    flag(cli::make_flag(cli::Name{"service"}, cli::Description{"name of the service hosting the provider."}, service));
-    flag(cli::make_flag(cli::Name{"path"}, cli::Description{"dbus object path hosting the provider."}, path));
     flag(cli::make_flag(cli::Name{"id"}, cli::Description{"id of the actual provider implementation."}, id));
 
     action([this](const Context& ctxt)
     {
-        die_if(not service, ctxt.cout, "service name is missing");
-        die_if(not path, ctxt.cout, "object path is missing");
         die_if(not id, ctxt.cout, "name of actual provider implementation is missing");
 
         // We exit cleanly for SIGINT and SIGTERM.
@@ -62,16 +59,15 @@
 
         auto impl = location::ProviderFactory::instance().create_provider_for_name_with_config(*id, location::Configuration{});
 
-        auto rt = location::Runtime::create();
-        rt->start();
+        auto rt = location::Runtime::create(); rt->start();
 
         auto incoming = std::make_shared<core::dbus::Bus>(bus);
         incoming->install_executor(core::dbus::asio::make_executor(incoming, rt->service()));
-        auto object = core::dbus::Service::add_service(incoming, *service)
-                        ->add_object_for_path(core::dbus::types::ObjectPath{*path});
-
-        location::providers::remote::skeleton::Configuration config{object, incoming, impl};
-        auto skeleton = location::providers::remote::skeleton::create_with_configuration(config);
+
+        auto service = core::dbus::Service::use_service<location::dbus::Service>(incoming);
+        auto stub = std::make_shared<location::dbus::stub::Service>(incoming, service, service->object_for_path(core::dbus::types::ObjectPath{location::dbus::Service::path()}));
+
+        stub->add_provider(impl);
 
         trap->run();
 
@@ -80,4 +76,3 @@
         return EXIT_SUCCESS;
     });
 }
-

=== modified file 'src/location/cmds/provider.h'
--- src/location/cmds/provider.h	2016-06-30 09:13:21 +0000
+++ src/location/cmds/provider.h	2016-07-13 14:07:39 +0000
@@ -42,8 +42,6 @@
 
 private:
     core::dbus::WellKnownBus bus;   // The bus we should connect to.
-    Optional<std::string> service;  // The name of the service under which the provider should be exposed.
-    Optional<std::string> path;     // The dbus object path under which the provider is known.
     Optional<std::string> id;       // The id of the actual provider implementation.
 };
 }

=== modified file 'src/location/cmds/run.cpp'
--- src/location/cmds/run.cpp	2016-06-30 09:15:49 +0000
+++ src/location/cmds/run.cpp	2016-07-13 14:07:39 +0000
@@ -21,13 +21,13 @@
 
 #include <location/boost_ptree_settings.h>
 #include <location/fusion_provider_selection_policy.h>
+#include <location/runtime.h>
 #include <location/service_with_engine.h>
 #include <location/settings.h>
 #include <location/trust_store_permission_manager.h>
 
 #include <location/dbus/skeleton/service.h>
-#include <location/runtime.h>
-
+#include <location/providers/dummy/provider.h>
 #include <location/util/well_known_bus.h>
 
 #include <core/dbus/asio/executor.h>
@@ -37,9 +37,11 @@
 
 location::cmds::Run::Run()
     : CommandWithFlagsAndAction{cli::Name{"run"}, cli::Usage{"run"}, cli::Description{"runs the daemon"}},
+      testing{false},
       bus{core::dbus::WellKnownBus::system},
       settings{"/var/lib/ubuntu-location-service/config.ini"}
 {
+    flag(cli::make_flag(cli::Name{"testing"}, cli::Description{"whether we are running under testing, defaults to false"}, testing));
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
     flag(cli::make_flag(cli::Name{"config"}, cli::Description{"daemon configuration"}, config));
     flag(cli::make_flag(cli::Name{"settings"}, cli::Description{"path to runtime persistent state data"}, settings));
@@ -53,7 +55,7 @@
         trap->signal_raised().connect([trap](core::posix::Signal)
         {
             trap->stop();
-        });
+        });        
 
         // The engine instance is the core piece of functionality.
         auto engine = std::make_shared<location::Engine>(
@@ -65,6 +67,13 @@
             // parameters change.
             std::make_shared<location::SyncingSettings>(std::make_shared<location::BoostPtreeSettings>(settings.string())));
 
+        // We make sure that at least one provider is available to clients.
+        if (testing)
+        {
+            ctxt.cout << "Running under testing..." << std::endl;
+            engine->add_provider(std::make_shared<location::providers::dummy::Provider>());
+        }
+
         auto rt = location::Runtime::create();
 
         auto incoming = std::make_shared<core::dbus::Bus>(bus);

=== modified file 'src/location/cmds/run.h'
--- src/location/cmds/run.h	2016-06-30 09:13:21 +0000
+++ src/location/cmds/run.h	2016-07-13 14:07:39 +0000
@@ -40,11 +40,13 @@
     // Run initializes a new instance.
     Run();
 
+    
 private:
     // Ensure that log files dating back to before the fix
     // for lp:1447110 are removed and do not waste space.
     void account_for_lp1447110() const;
 
+    bool testing;                               // Whether we are running in a testing environment.
     core::dbus::WellKnownBus bus;               // The bus we should connect to.
     Optional<boost::filesystem::path> config;   // Optionally load configuration from this config file.
     boost::filesystem::path settings;           // Runtime persistent state settings are loaded from this file.

=== modified file 'src/location/cmds/status.cpp'
--- src/location/cmds/status.cpp	2016-06-30 09:15:49 +0000
+++ src/location/cmds/status.cpp	2016-07-13 14:07:39 +0000
@@ -19,21 +19,48 @@
 
 #include <location/cmds/status.h>
 #include <location/dbus/stub/service.h>
-#include <location/service/runtime.h>
+#include <location/runtime.h>
 #include <location/util/well_known_bus.h>
 
 #include <core/dbus/asio/executor.h>
 
 namespace cli = location::util::cli;
 
-location::cmds::Status::Status()
+location::cmds::Status::PrintingDelegate::PrintingDelegate(std::ostream& out) : out{out}
+{
+}
+
+// From Delegate.
+void location::cmds::Status::PrintingDelegate::on_summary(const Summary& summary)
+{
+    out << "  is online:                   " << std::boolalpha  << summary.is_online                        << std::endl
+        << "  state:                       "                    << summary.state                            << std::endl
+        << "  satellite based positioning: " << std::boolalpha  << summary.does_satellite_based_positioning << std::endl
+        << "  reports cell & wifi ids:     " << std::boolalpha  << summary.does_report_cell_and_wifi_ids    << std::endl;
+
+    if (summary.svs.size() > 0)
+    {
+        out << "  svs:" << std::endl;
+        for (const auto& pair : summary.svs)
+            out << "    " << pair.second << std::endl;
+    }
+    else
+    {
+        out << "  svs:                         " << "none";
+    }
+
+    out << std::endl;
+}
+
+location::cmds::Status::Status(const std::shared_ptr<Delegate>& delegate)
     : CommandWithFlagsAndAction{cli::Name{"status"}, cli::Usage{"status"}, cli::Description{"queries the status of the daemon"}},
+      delegate{delegate},
       bus{core::dbus::WellKnownBus::system}
 {
     flag(cli::make_flag(cli::Name{"bus"}, cli::Description{"bus instance to connect to, defaults to system"}, bus));
     action([this](const Context& ctxt)
     {
-        auto rt = location::service::Runtime::create();
+        auto rt = location::Runtime::create();
 
         auto conn = std::make_shared<core::dbus::Bus>(bus);
 
@@ -44,23 +71,14 @@
 
         rt->start();
 
-        ctxt.cout << "  is online:                   " << std::boolalpha << stub->is_online() << std::endl
-                  << "  state:                       " << stub->state() << std::endl
-                  << "  satellite based positioning: " << std::boolalpha << stub->does_satellite_based_positioning() << std::endl
-                  << "  reports cell & wifi ids:     " << std::boolalpha << stub->does_report_cell_and_wifi_ids() << std::endl;
-        auto svs = stub->visible_space_vehicles().get();
-        if (svs.size() > 0)
-        {
-            ctxt.cout << "  svs:" << std::endl;
-            for (const auto& pair : svs)
-                ctxt.cout << "    " << pair.second << std::endl;
-        }
-        else
-        {
-            ctxt.cout << "  svs:                         " << "none";
-        }
-
-        ctxt.cout << std::endl;
+        Status::delegate->on_summary(Summary
+        {
+            stub->is_online(),
+            stub->state(),
+            stub->does_satellite_based_positioning(),
+            stub->does_report_cell_and_wifi_ids(),
+            stub->visible_space_vehicles()
+        });
 
         conn->stop(); rt->stop();
 

=== modified file 'src/location/cmds/status.h'
--- src/location/cmds/status.h	2016-06-30 09:13:21 +0000
+++ src/location/cmds/status.h	2016-07-13 14:07:39 +0000
@@ -21,6 +21,7 @@
 #define LOCATION_CMDS_STATUS_H_
 
 #include <location/optional.h>
+#include <location/service.h>
 #include <location/util/cli.h>
 
 #include <core/dbus/well_known_bus.h>
@@ -37,11 +38,44 @@
 class Status : public util::cli::CommandWithFlagsAndAction
 {
 public:
+    // Summary bundles the state summary of a location::Service instance.
+    struct Summary
+    {
+        bool is_online;
+        Service::State state;
+        bool does_satellite_based_positioning;
+        bool does_report_cell_and_wifi_ids;
+        std::map<SpaceVehicle::Key, SpaceVehicle> svs;
+    };
+
+    // Delegate abstracts handling of an incoming state summary.
+    class Delegate : public util::DoNotCopyOrMove
+    {
+    public:
+        // on_summary is called whenever a state summary of a service instance has been assembled.
+        virtual void on_summary(const Summary& summary) = 0;
+    };
+
+    // PrintingDelegate is a Delegate printing to a std::ostream.
+    class PrintingDelegate : public Delegate
+    {
+    public:
+        // PrintingDelegate initializes a new instance with out.
+        PrintingDelegate(std::ostream& out = std::cout);
+
+        // From Delegate.
+        void on_summary(const Summary& summary) override;
+
+    private:
+        std::ostream& out; // The output stream we print to.
+    };
+
     // Status initializes a new instance.
-    Status();
+    Status(const std::shared_ptr<Delegate>& delegate = std::make_shared<PrintingDelegate>());
 
 private:
-    core::dbus::WellKnownBus bus; // The bus we should connect to.
+    std::shared_ptr<Delegate> delegate; // We dispatch summary information to this delegate implementation.
+    core::dbus::WellKnownBus bus;       // The bus we should connect to.
 };
 }
 }

=== renamed file 'src/location/service/config.h.in' => 'src/location/config.h.in'
--- src/location/service/config.h.in	2016-06-26 21:17:03 +0000
+++ src/location/config.h.in	2016-07-13 14:07:39 +0000
@@ -15,18 +15,15 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#ifndef LOCATION_SERVICE_CONFIG_H_
-#define LOCATION_SERVICE_CONFIG_H_
+#ifndef LOCATION_CONFIG_H_
+#define LOCATION_CONFIG_H_
 
 namespace location
 {
-namespace service
-{
 static constexpr const char* trust_store_service_name
 {
     "@UBUNTU_LOCATION_SERVICE_TRUST_STORE_SERVICE_NAME@"
 };
 }
-}
 
-#endif // LOCATION_SERVICE_CONFIG_H_
+#endif // LOCATION_CONFIG_H_

=== modified file 'src/location/daemon.cpp'
--- src/location/daemon.cpp	2016-06-30 09:13:21 +0000
+++ src/location/daemon.cpp	2016-07-13 14:07:39 +0000
@@ -20,6 +20,7 @@
 #include <location/daemon.h>
 
 #include <location/cmds/list.h>
+#include <location/cmds/monitor.h>
 #include <location/cmds/provider.h>
 #include <location/cmds/run.h>
 #include <location/cmds/status.h>
@@ -35,6 +36,7 @@
     : cmd{cli::Name{"locationd"}, cli::Usage{"locationd"}, cli::Description{"locationd"}}
 {    
     cmd.command(std::make_shared<location::cmds::List>());
+    cmd.command(std::make_shared<location::cmds::Monitor>());
     cmd.command(std::make_shared<location::cmds::Provider>());
     cmd.command(std::make_shared<location::cmds::Run>());
     cmd.command(std::make_shared<location::cmds::Status>());

=== modified file 'src/location/dbus/codec.h'
--- src/location/dbus/codec.h	2016-06-28 11:53:34 +0000
+++ src/location/dbus/codec.h	2016-07-13 14:07:39 +0000
@@ -26,7 +26,6 @@
 #include <location/update.h>
 #include <location/velocity.h>
 #include <location/service.h>
-#include <location/service/state.h>
 #include <location/units/units.h>
 #include <location/wgs84/altitude.h>
 #include <location/wgs84/latitude.h>
@@ -85,49 +84,6 @@
 
 namespace helper
 {
-template<>
-struct TypeMapper<location::service::State>
-{
-    constexpr static ArgumentType type_value()
-    {
-        return ArgumentType::string;
-    }
-
-    constexpr static bool is_basic_type()
-    {
-        return true;
-    }
-    constexpr static bool requires_signature()
-    {
-        return false;
-    }
-
-    static std::string signature()
-    {
-        static const std::string s = TypeMapper<std::string>::signature();
-        return s;
-    }
-};
-}
-
-template<>
-struct Codec<location::service::State>
-{
-    static void encode_argument(Message::Writer& writer, const location::service::State& in)
-    {
-        std::stringstream ss; ss << in; auto s = ss.str();
-        writer.push_stringn(s.c_str(), s.size());
-    }
-
-    static void decode_argument(Message::Reader& reader, location::service::State& in)
-    {
-        auto s = reader.pop_string();
-        std::stringstream ss{s}; ss >> in;
-    }
-};
-
-namespace helper
-{
 template<typename T>
 struct TypeMapper<location::units::Quantity<T>>
 {

=== modified file 'src/location/dbus/service.h'
--- src/location/dbus/service.h	2016-06-28 11:53:34 +0000
+++ src/location/dbus/service.h	2016-07-13 14:07:39 +0000
@@ -42,6 +42,12 @@
         {
             inline static std::string name() { return "com.ubuntu.location.Service.Error.InsufficientPermissions";}
         };
+
+        struct AddingProvider
+        {
+            inline static std::string name() { return "com.ubuntu.location.Service.Error.AddingProvider";}
+        };
+
         struct CreatingSession
         {
             inline static std::string name() { return "com.ubuntu.location.Service.Error.CreatingSession"; }
@@ -66,6 +72,24 @@
         }
     };
 
+    struct AddProvider
+    {
+        typedef dbus::Service Interface;
+
+        inline static const std::string& name()
+        {
+            static const std::string s{"AddProvider"};
+            return s;
+        }
+
+        typedef void ResultType;
+
+        inline static const std::chrono::milliseconds default_timeout()
+        {
+            return std::chrono::seconds{25};
+        }
+    };
+
     struct Properties
     {
         struct State

=== modified file 'src/location/dbus/skeleton/service.cpp'
--- src/location/dbus/skeleton/service.cpp	2016-06-30 09:13:21 +0000
+++ src/location/dbus/skeleton/service.cpp	2016-07-13 14:07:39 +0000
@@ -21,6 +21,8 @@
 
 #include <location/dbus/codec.h>
 
+#include <location/providers/remote/stub.h>
+
 #include <location/criteria.h>
 #include <location/logging.h>
 
@@ -114,14 +116,26 @@
           }
       }
 {
+    object->install_method_handler<location::dbus::Service::AddProvider>([this](const core::dbus::Message::Ptr& msg)
+    {
+        handle_add_provider(msg);
+    });
+
     object->install_method_handler<location::dbus::Service::CreateSessionForCriteria>([this](const core::dbus::Message::Ptr& msg)
     {
         handle_create_session_for_criteria(msg);
     });
+
+    properties.state->set(configuration.impl->state());
+    properties.is_online->set(configuration.impl->is_online());
+    properties.does_report_cell_and_wifi_ids->set(configuration.impl->does_report_cell_and_wifi_ids());
+    properties.does_satellite_based_positioning->set(configuration.impl->does_satellite_based_positioning());
+    properties.visible_space_vehicles->set(configuration.impl->visible_space_vehicles());
 }
 
 location::dbus::skeleton::Service::~Service() noexcept
 {
+    object->uninstall_method_handler<location::dbus::Service::AddProvider>();
     object->uninstall_method_handler<location::dbus::Service::CreateSessionForCriteria>();
 }
 
@@ -130,6 +144,29 @@
     return *properties.state;
 }
 
+void location::dbus::skeleton::Service::handle_add_provider(const core::dbus::Message::Ptr& msg)
+{
+    VLOG(1) << __PRETTY_FUNCTION__;
+
+    try
+    {
+        std::string sender = msg->sender();
+        core::dbus::types::ObjectPath path; msg->reader() >> path;
+        auto service = core::dbus::Service::use_service(configuration.outgoing, sender);
+        auto object = service->object_for_path(path);
+
+        add_provider(location::providers::remote::stub::create_with_configuration({object}));
+        configuration.outgoing->send(core::dbus::Message::make_method_return(msg));
+    }
+    catch(...)
+    {
+        // We failed to add the provider and let the requesting party know about the issue
+        // without exposing any detailed information.
+        configuration.outgoing->send(core::dbus::Message::make_error(msg, location::dbus::Service::Errors::AddingProvider::name(), ""));
+
+    }
+}
+
 void location::dbus::skeleton::Service::handle_create_session_for_criteria(const core::dbus::Message::Ptr& in)
 {
     VLOG(1) << __PRETTY_FUNCTION__;
@@ -331,3 +368,8 @@
 {
     return configuration.impl->create_session_for_criteria(criteria);
 }
+
+void location::dbus::skeleton::Service::add_provider(const Provider::Ptr& provider)
+{
+    configuration.impl->add_provider(provider);
+}

=== modified file 'src/location/dbus/skeleton/service.h'
--- src/location/dbus/skeleton/service.h	2016-06-30 09:13:21 +0000
+++ src/location/dbus/skeleton/service.h	2016-07-13 14:07:39 +0000
@@ -113,10 +113,16 @@
     core::Property<bool>& is_online() override;
     core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles() override;
     Session::Ptr create_session_for_criteria(const Criteria& criteria) override;
+    void add_provider(const Provider::Ptr& provider) override;
+
 protected:
     // Enable subclasses to alter the state.
     core::Property<State>& mutable_state();
 private:
+    // Handles incoming message calls for add_provider.
+    // Dispatches to the actual implementation and manages object lifetimes.
+    void handle_add_provider(const core::dbus::Message::Ptr& msg);
+
     // Handles incoming message calls for create_session_for_criteria.
     // Dispatches to the actual implementation, and manages object lifetimes.
     void handle_create_session_for_criteria(const core::dbus::Message::Ptr& msg);

=== modified file 'src/location/dbus/skeleton/session.cpp'
--- src/location/dbus/skeleton/session.cpp	2016-06-28 11:53:34 +0000
+++ src/location/dbus/skeleton/session.cpp	2016-07-13 14:07:39 +0000
@@ -160,7 +160,7 @@
 
     try
     {
-        configuration.local.impl->updates().position_status = Updates::Status::enabled;
+        configuration.local.impl->updates().heading_status = Updates::Status::enabled;
         reply = core::dbus::Message::make_method_return(msg);
     } catch(const std::runtime_error& e)
     {

=== modified file 'src/location/dbus/stub/service.cpp'
--- src/location/dbus/stub/service.cpp	2016-06-28 11:53:34 +0000
+++ src/location/dbus/stub/service.cpp	2016-07-13 14:07:39 +0000
@@ -22,10 +22,25 @@
 #include <location/dbus/codec.h>
 #include <location/dbus/service.h>
 
+#include <location/providers/remote/skeleton.h>
+
 #include <location/logging.h>
 
 #include <core/dbus/property.h>
 
+#include <boost/format.hpp>
+
+namespace
+{
+core::dbus::types::ObjectPath generate_path_for_provider()
+{
+    static constexpr const char* pattern{"/com/ubuntu/location/provider/%1%"};
+    static std::size_t counter{0};
+
+    return core::dbus::types::ObjectPath{(boost::format{pattern} % ++counter).str()};
+}
+}
+
 location::dbus::stub::Service::Service(const core::dbus::Bus::Ptr& connection,
                                        const core::dbus::Service::Ptr& service,
                                        const core::dbus::Object::Ptr& object) :
@@ -56,6 +71,28 @@
     return std::make_shared<location::dbus::stub::Session>(connection, service->add_object_for_path(op.value()));
 }
 
+void location::dbus::stub::Service::add_provider(const Provider::Ptr& provider)
+{
+    auto path = generate_path_for_provider();
+
+    auto skeleton = location::providers::remote::skeleton::create_with_configuration(
+    {
+        service->add_object_for_path(path),
+        connection,
+        provider
+    });
+
+    auto op = object->transact_method
+    <
+        location::dbus::Service::AddProvider,
+        location::dbus::Service::AddProvider::ResultType
+    >(path);
+
+    if (op.is_error()) throw std::runtime_error{op.error().print()};
+
+    providers.insert(skeleton);
+}
+
 const core::Property<location::Service::State>& location::dbus::stub::Service::state() const
 {
     return *state_;

=== modified file 'src/location/dbus/stub/service.h'
--- src/location/dbus/stub/service.h	2016-06-28 11:53:34 +0000
+++ src/location/dbus/stub/service.h	2016-07-13 14:07:39 +0000
@@ -46,12 +46,15 @@
     core::Property<bool>& does_report_cell_and_wifi_ids() override;
     core::Property<bool>& is_online() override;
     core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles() override;
+    void add_provider(const Provider::Ptr &provider) override;
 
   private:
     core::dbus::Bus::Ptr connection;
     core::dbus::Service::Ptr service;
     core::dbus::Object::Ptr object;
 
+    std::set<Provider::Ptr> providers;
+
     std::shared_ptr<core::dbus::Property<location::dbus::Service::Properties::State>> state_;
     std::shared_ptr<core::dbus::Property<location::dbus::Service::Properties::DoesSatelliteBasedPositioning>> does_satellite_based_positioning_;
     std::shared_ptr<core::dbus::Property<location::dbus::Service::Properties::DoesReportCellAndWifiIds>> does_report_cell_and_wifi_ids_;

=== removed file 'src/location/init_and_shutdown.cpp'
--- src/location/init_and_shutdown.cpp	2016-06-26 21:17:03 +0000
+++ src/location/init_and_shutdown.cpp	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#include <location/init_and_shutdown.h>
-#include <location/logging.h>
-
-#include <gflags/gflags.h>
-
-void location::init(int* argc, char*** argv)
-{
-    static const bool remove_parsed_flags = true;
-    google::ParseCommandLineFlags(argc, argv, remove_parsed_flags);
-}
-
-void location::shutdown()
-{
-    google::ShutDownCommandLineFlags();
-}

=== removed file 'src/location/init_and_shutdown.h'
--- src/location/init_and_shutdown.h	2016-06-28 11:53:34 +0000
+++ src/location/init_and_shutdown.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_INIT_AND_SHUTDOWN_H_
-#define LOCATION_INIT_AND_SHUTDOWN_H_
-
-namespace location
-{
-/** \brief Initializes the library. */
-void init(int* argc, char*** argv);
-
-/** \brief Shuts down the library and frees all acquired resources. */
-void shutdown();
-}
-
-#endif // LOCATION_INIT_AND_SHUTDOWN_H_

=== modified file 'src/location/providers/config.cpp'
--- src/location/providers/config.cpp	2016-06-27 06:44:50 +0000
+++ src/location/providers/config.cpp	2016-07-13 14:07:39 +0000
@@ -19,7 +19,6 @@
 #include <location/provider_factory.h>
 
 #include "dummy/provider.h"
-#include "dummy/delayed_provider.h"
 
 #include <map>
 
@@ -40,12 +39,6 @@
     location::providers::dummy::Provider::create_instance
 };
 
-static FactoryInjector dummy_delayed_injector
-{
-    "dummy::DelayedProvider",
-    location::providers::dummy::DelayedProvider::create_instance
-};
-
 #include <location/providers/remote/provider.h>
 static FactoryInjector remote_injector
 {

=== modified file 'src/location/providers/dummy/CMakeLists.txt'
--- src/location/providers/dummy/CMakeLists.txt	2015-11-24 13:10:09 +0000
+++ src/location/providers/dummy/CMakeLists.txt	2016-07-13 14:07:39 +0000
@@ -2,9 +2,7 @@
   dummy
   
   provider.h
-  provider.cpp
-  delayed_provider.h
-  delayed_provider.cpp)
+  provider.cpp)
 
 set(
   ENABLED_PROVIDER_TARGETS

=== removed file 'src/location/providers/dummy/delayed_provider.cpp'
--- src/location/providers/dummy/delayed_provider.cpp	2016-06-26 21:17:03 +0000
+++ src/location/providers/dummy/delayed_provider.cpp	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2015 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: Scott Sweeny <[e-mail]>
- */
-
-#include <location/logging.h>
-
-#include <chrono>
-#include <thread>
-
-#include "delayed_provider.h"
-
-namespace dummy = location::providers::dummy;
-
-std::string dummy::DelayedProvider::class_name()
-{
-    return "dummy::DelayedProvider";
-}
-
-location::Provider::Ptr dummy::DelayedProvider::create_instance(const ProviderFactory::Configuration& config)
-{
-    int delay = config.get(dummy::DelayConfiguration::Keys::delay, 0);
-    VLOG(1) << __PRETTY_FUNCTION__ << ": delay for " << delay << "ms";
-
-    std::this_thread::sleep_for(std::chrono::milliseconds{delay});
-
-    return dummy::Provider::create_instance(config);
-}

=== removed file 'src/location/providers/dummy/delayed_provider.h'
--- src/location/providers/dummy/delayed_provider.h	2016-06-27 06:44:50 +0000
+++ src/location/providers/dummy/delayed_provider.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright © 2015 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: Scott Sweeny <[e-mail]>
- */
-
-#ifndef LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
-#define LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
-
-#include "provider.h"
-
-namespace location
-{
-namespace providers
-{
-namespace dummy
-{
-    struct DelayConfiguration
-    {
-        struct Keys
-        {
-            static constexpr const char* delay
-            {
-                "DelayInMs"
-            };
-        };
-    };
-
-class DelayedProvider : public Provider
-{
-    public:
-        // For integration with the Provider factory
-        static std::string class_name();
-        // Waits for "DelayInMs" from the provided property bundle then
-        // instantiates a new provider instance, populating the configuration object
-        // from the provided property bundle.
-        static DelayedProvider::Ptr create_instance(const ProviderFactory::Configuration&);
-        // Creates a new provider instance from the given configuration.
-        DelayedProvider(const Configuration config = Configuration{});
-};
-}
-}
-}
-
-#endif // LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_

=== modified file 'src/location/providers/dummy/provider.cpp'
--- src/location/providers/dummy/provider.cpp	2016-06-26 21:17:03 +0000
+++ src/location/providers/dummy/provider.cpp	2016-07-13 14:07:39 +0000
@@ -146,13 +146,15 @@
 
         while (!d->stop_requested)
         {
+            VLOG(10) << position_update;
+
             position_update.when = location::Clock::now();
             heading_update.when = location::Clock::now();
             velocity_update.when = location::Clock::now();
 
             mutable_updates().position(position_update);
             mutable_updates().heading(heading_update);
-            mutable_updates().velocity(velocity_update);
+            mutable_updates().velocity(velocity_update);           
 
             std::this_thread::sleep_for(d->configuration.update_period);
         }

=== modified file 'src/location/providers/remote/stub.cpp'
--- src/location/providers/remote/stub.cpp	2016-06-26 21:17:03 +0000
+++ src/location/providers/remote/stub.cpp	2016-07-13 14:07:39 +0000
@@ -22,7 +22,7 @@
 
 namespace remote = location::providers::remote;
 
-location::Provider::Ptr remote::stub::create_with_configuration(const remote::stub::Configuration& configuration)
+location::Provider::Ptr remote::stub::  create_with_configuration(const remote::stub::Configuration& configuration)
 {
     return remote::Provider::Stub::create_instance_with_config(configuration);
 }

=== removed directory 'src/location/service'
=== removed file 'src/location/service/configuration.h'
--- src/location/service/configuration.h	2016-06-28 11:53:34 +0000
+++ src/location/service/configuration.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_CONFIGURATION_H_
-#define LOCATION_SERVICE_CONFIGURATION_H_
-
-#include <location/service/permission_manager.h>
-
-#include <location/provider.h>
-#include <location/provider_selection_policy.h>
-
-#include <set>
-
-namespace location
-{
-class Engine;
-namespace service
-{
-class Configuration
-{
-public:
-    virtual ~Configuration() = default;
-    Configuration(const Configuration&) = delete;
-    Configuration& operator=(const Configuration&) = delete;
-
-    virtual std::shared_ptr<Engine> the_engine(
-    	const std::set<Provider::Ptr>& provider_set,
-        const ProviderSelectionPolicy::Ptr& provider_selection_policy) = 0;
-    
-    virtual ProviderSelectionPolicy::Ptr the_provider_selection_policy() = 0;
-    virtual std::set<Provider::Ptr> the_provider_set() = 0;
-    virtual PermissionManager::Ptr the_permission_manager() = 0;
-
-protected:
-    Configuration() = default;
-};
-}
-}
-
-#endif // LOCATION_SERVICE_CONFIGURATION_H_

=== removed file 'src/location/service/daemon.cpp'
--- src/location/service/daemon.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/daemon.cpp	1970-01-01 00:00:00 +0000
@@ -1,520 +0,0 @@
-/*
- * Copyright © 2012-2013 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 PARTIlocationAR 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: Thomas Voß <[e-mail]>
- */
-
-#include <location/logging.h>
-#include <location/boost_ptree_settings.h>
-#include <location/provider_factory.h>
-
-#include <location/logging.h>
-#include <location/connectivity/dummy_connectivity_manager.h>
-
-#include <location/service/default_configuration.h>
-#include <location/service/demultiplexing_reporter.h>
-#include <location/service/ichnaea_reporter.h>
-#include <location/service/implementation.h>
-#include <location/service/stub.h>
-
-#include <location/service/runtime_tests.h>
-
-#include "program_options.h"
-#include "daemon.h"
-#include "runtime.h"
-
-#include <core/dbus/announcer.h>
-#include <core/dbus/resolver.h>
-#include <core/dbus/asio/executor.h>
-
-#include <core/posix/signal.h>
-
-#include <boost/asio.hpp>
-#include <boost/filesystem.hpp>
-
-#include <system_error>
-#include <thread>
-
-#include <signal.h>
-#include <sys/signalfd.h>
-
-namespace dbus = core::dbus;
-
-namespace
-{
-struct NullReporter : public location::service::Harvester::Reporter
-{
-    NullReporter() = default;
-
-    /** @brief Tell the reporter that it should start operating. */
-    void start()
-    {
-    }
-
-    /** @brief Tell the reporter to shut down its operation. */
-    void stop()
-    {
-    }
-
-    /**
-     * @brief Triggers the reporter to send off the information.
-     */
-    void report(const location::Update<location::Position>&,
-                const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>&,
-                const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>&)
-    {
-    }
-};
-
-location::ProgramOptions init_daemon_options()
-{
-    location::ProgramOptions options;
-
-    options.add("help", "Produces this help message");
-    options.add("testing", "Enables running the service without providers");
-    options.add("config-file",
-                "The configuration we should read from/write to",
-                std::string{"/var/lib/ubuntu-location-service/config.ini"});
-    options.add_composed<std::vector<std::string>>(
-                "provider",
-                "The providers that should be added to the engine");
-
-    return options;
-}
-
-location::ProgramOptions& mutable_daemon_options()
-{
-    static location::ProgramOptions options = init_daemon_options();
-    return options;
-}
-}
-
-location::service::Daemon::Configuration location::service::Daemon::Configuration::from_command_line_args(
-        int argc,
-        const char** argv,
-        location::service::DBusConnectionFactory factory)
-{
-    location::service::Daemon::Configuration result;
-
-    // Make sure options are cleared between runs (needed for testing)
-    mutable_daemon_options().clear();
-
-    if (!mutable_daemon_options().parse_from_command_line_args(argc, (const char**)argv))
-        throw std::runtime_error{"Could not parse command-line, aborting..."};
-
-    result.incoming = factory(mutable_daemon_options().bus());
-    result.outgoing = factory(mutable_daemon_options().bus());
-
-    if (mutable_daemon_options().value_count_for_key("testing") == 0 && mutable_daemon_options().value_count_for_key("provider") == 0)
-    {
-        std::stringstream ss;
-        ss << "A set of providers need to be specified. The following providers are known:" << std::endl;
-        location::ProviderFactory::instance().enumerate(
-                    [&ss](const std::string& name, const location::ProviderFactory::Factory&)
-        {
-            ss << "\t" << name << std::endl;
-        });
-        throw std::runtime_error{ss.str()};
-    }
-
-    if(mutable_daemon_options().value_count_for_key("provider") > 0)
-    {
-        result.providers = mutable_daemon_options().value_for_key<std::vector<std::string>>("provider");
-
-        for (const std::string& provider : result.providers)
-        {
-            mutable_daemon_options().enumerate_unrecognized_options(
-                        [&result, provider](const std::string& s)
-            {
-                std::stringstream in(s);
-                std::string key, value;
-
-                std::getline(in, key, '=');
-                std::getline(in, value, '=');
-
-                std::size_t pos = key.find(provider);
-                if (pos == std::string::npos)
-                    return;
-                static const std::string option_marker{"--"};
-                static const std::string scope_separator{"::"};
-                key = key.erase(key.find_first_of(option_marker), option_marker.size());
-                key = key.erase(key.find_first_of(provider), provider.size());
-                key = key.erase(key.find_first_of(scope_separator), scope_separator.size());
-
-                std::cout << "\t" << key << " -> " << value << std::endl;
-
-                result.provider_options[provider].put(key, value);
-            });
-        }
-    }
-
-    auto settings = std::make_shared<location::BoostPtreeSettings>(mutable_daemon_options().value_for_key<std::string>("config-file"));
-    result.settings = std::make_shared<location::SyncingSettings>(settings);
-
-    return result;
-}
-
-void location::service::Daemon::print_help(std::ostream& out)
-{
-    mutable_daemon_options().print_help(out);
-}
-
-void location::service::Daemon::load_providers(const Configuration& config, std::shared_ptr<Engine> engine)
-{
-    for (const std::string& provider : config.providers)
-    {
-        std::cout << "Instantiating and configuring: " << provider << std::endl;
-
-        try
-        {
-            auto result = std::async(std::launch::async, [provider, config, engine] {
-                return location::ProviderFactory::instance().create_provider_for_name_with_config(
-                    provider,
-                    config.provider_options.count(provider) > 0 ?
-                        config.provider_options.at(provider) : location::Configuration {},
-                    [engine](Provider::Ptr provider)
-                    {
-                        engine->add_provider(provider);
-                    }
-                );
-            });
-        } catch(const std::runtime_error& e)
-        {
-            std::cerr << "Issue instantiating provider: " << e.what() << std::endl;
-        }
-    }
-}
-
-int location::service::Daemon::main(const location::service::Daemon::Configuration& config)
-{
-    // Ensure that log files dating back to before the fix
-    // for lp:1447110 are removed and do not waste space.
-    {
-        static const boost::filesystem::path old_log_dir{"/var/log/ubuntu-location-service"};
-        boost::system::error_code ec;
-        boost::filesystem::remove_all(old_log_dir, ec);
-    }
-    // Setup logging for the daemon.
-    FLAGS_logtostderr = true;
-    FLAGS_stop_logging_if_full_disk = true;
-    FLAGS_max_log_size = 5;
-
-    google::InitGoogleLogging("com.ubuntu.location");
-
-    auto trap = core::posix::trap_signals_for_all_subsequent_threads(
-    {
-        core::posix::Signal::sig_term,
-        core::posix::Signal::sig_int
-    });
-
-    trap->signal_raised().connect([trap](const core::posix::Signal&)
-    {
-        trap->stop();
-    });
-
-    auto runtime = location::service::Runtime::create(4);
-
-    location::service::DefaultConfiguration dc;
-    auto engine = dc.the_engine(std::set<location::Provider::Ptr>{}, dc.the_provider_selection_policy(), config.settings);
-    load_providers(config, engine);
-
-    config.incoming->install_executor(dbus::asio::make_executor(config.incoming, runtime->service()));
-    config.outgoing->install_executor(dbus::asio::make_executor(config.outgoing, runtime->service()));
-
-    runtime->start();
-
-    location::service::Implementation::Configuration configuration
-    {
-        config.incoming,
-        config.outgoing,
-        engine,
-        dc.the_permission_manager(config.outgoing),
-        location::service::Harvester::Configuration
-        {
-            std::make_shared<dummy::ConnectivityManager>(),
-            std::make_shared<NullReporter>()
-        }
-    };
-
-    auto location_service = std::make_shared<location::service::Implementation>(configuration);
-
-    trap->run();
-
-    return EXIT_SUCCESS;
-}
-
-namespace
-{
-location::ProgramOptions init_cli_options()
-{
-    location::ProgramOptions options;
-
-    options.add("help", "Produces this help message");
-    options.add("property",
-                "Property to set/get from a running service, known properties are:\n"
-                "   state [get]\n"
-                "   is_online [get/set]\n"
-                "   does_satellite_based_positioning [get/set]\n"
-                "   does_report_wifi_and_cell_ids [get/set]\n"
-                "   visible_space_vehicles [get]",
-                location::service::Daemon::Cli::Property::unknown);
-    options.add<std::string>("set", "Adjust the value of the property.");
-    options.add("get", "Query the value of the property.");
-    options.add("test", "Executes runtime tests.");
-
-    return options;
-}
-
-location::ProgramOptions& mutable_cli_options()
-{
-    static location::ProgramOptions options = init_cli_options();
-    return options;
-}
-}
-
-location::service::Daemon::Cli::Configuration location::service::Daemon::Cli::Configuration::from_command_line_args(
-        int argc,
-        const char** argv,
-        location::service::DBusConnectionFactory factory)
-{
-    location::service::Daemon::Cli::Configuration result;
-
-    if (!mutable_cli_options().parse_from_command_line_args(argc, (const char**)argv))
-    {
-        throw std::runtime_error{"Error parsing command line"};
-    }
-
-    if (mutable_cli_options().value_count_for_key("help") > 0)
-    {
-        throw std::runtime_error{"Error parsing command line"};
-    }
-
-    if (mutable_cli_options().value_count_for_key("get") > 0 && mutable_cli_options().value_count_for_key("set") > 0)
-    {
-        throw std::logic_error
-        {
-            "Both set and get specified, aborting..."
-        };
-    }
-
-    result.bus = factory(mutable_cli_options().bus());
-
-    result.property = mutable_cli_options().value_for_key<location::service::Daemon::Cli::Property>("property");
-
-    if (mutable_cli_options().value_count_for_key("get") > 0)
-    {
-        result.command = Command::get;
-    }
-    else if (mutable_cli_options().value_count_for_key("set") > 0)
-    {
-        result.command = Command::set;
-        result.new_value = mutable_cli_options().value_for_key<std::string>("set");
-    }
-    else if (mutable_cli_options().value_count_for_key("test") > 0)
-    {
-        result.command = Command::test;
-    }
-
-    return result;
-}
-
-/** @brief Pretty-prints the CLI's help text to the given output stream. */
-void location::service::Daemon::Cli::print_help(std::ostream& out)
-{
-    mutable_cli_options().print_help(out);
-}
-
-int location::service::Daemon::Cli::main(const location::service::Daemon::Cli::Configuration& config)
-{
-    if (config.command == Command::test)
-        return location::service::execute_runtime_tests();
-
-    auto location_service =
-            dbus::resolve_service_on_bus<location::service::Interface, location::service::Stub>(config.bus);
-
-    switch (config.property)
-    {
-    case Property::state:
-        switch (config.command)
-        {
-        case Command::get:
-            std::cout << "Location service is " << location_service->state() << std::endl;
-            break;
-        default:
-            break;
-        }
-    case Property::is_online:
-        switch (config.command)
-        {
-        case Command::get:
-            std::cout << std::boolalpha << "Location service is "
-                      << (location_service->is_online() ? "online" : "offline") << std::endl;
-            break;
-        case Command::set:
-        {
-            std::stringstream ss(config.new_value);
-            bool flag = location_service->is_online();
-            ss >> std::boolalpha >> flag;
-
-            std::cout << "Adjusting is_online property to value: " << config.new_value << " -> ";
-
-            location_service->is_online() = flag;
-
-            if (location_service->is_online() != flag)
-            {
-                std::cout << "failed" << std::endl;
-                return EXIT_FAILURE;
-            }
-            std::cout << "succeeded" << std::endl;
-            break;
-        }
-        default:
-        case Command::unknown: break;
-        }
-        break;
-    case Property::does_report_wifi_and_cell_ids:
-        switch (config.command)
-        {
-        case Command::get:
-            std::cout << std::boolalpha << "Location service "
-                      << (location_service->does_report_cell_and_wifi_ids() ? "does" : "does not")
-                      << " report cell and wifi ids." << std::endl;
-            break;
-        case Command::set:
-        {
-            std::stringstream ss(config.new_value);
-            bool flag = location_service->does_report_cell_and_wifi_ids();
-            ss >> std::boolalpha >> flag;
-
-            std::cout << "Adjusting does_report_cell_and_wifi_ids property to value: "
-                      << std::boolalpha << flag << " -> ";
-            location_service->does_report_cell_and_wifi_ids() = flag;
-            if (location_service->does_report_cell_and_wifi_ids() != flag)
-            {
-                std::cout << "failed" << std::endl;
-                return EXIT_FAILURE;
-            }
-            std::cout << "succeeded" << std::endl;
-            break;
-        }
-        default:
-        case Command::unknown: break;
-        }
-        break;
-    case Property::does_satellite_based_positioning:
-        switch (config.command)
-        {
-        case Command::get:
-            std::cout << std::boolalpha << "Location service "
-                      << (location_service->does_satellite_based_positioning() ? "does" : "does not")
-                      << " satellite based positioning." << std::endl;
-            break;
-        case Command::set:
-        {
-            std::stringstream ss(config.new_value);
-            bool flag = location_service->does_satellite_based_positioning();
-            ss >> std::boolalpha >> flag;
-
-            std::cout << "Adjusting does_satellite_based_positioning property to value: "
-                      << std::boolalpha << flag << " -> ";
-            location_service->does_satellite_based_positioning() = flag;
-            if (location_service->does_satellite_based_positioning() != flag)
-            {
-                std::cout << "failed" << std::endl;
-                return EXIT_FAILURE;
-            }
-            std::cout << "succeeded" << std::endl;
-            break;
-        }
-        default:
-        case Command::unknown: break;
-        }
-        break;
-    case Property::visible_space_vehicles:
-    {
-        switch (config.command)
-        {
-        case Command::get:
-        {
-            auto svs = location_service->visible_space_vehicles().get();
-            std::cout << "Visible space vehicles:" << std::endl;
-            for (const auto& sv : svs)
-                std::cout << "\t" << sv.second << std::endl;
-            break;
-        }
-        case Command::set:
-            std::cout << "Property visible_space_vehicles is not set-able, aborting now." << std::endl;
-            location::service::Daemon::Cli::print_help(std::cout);
-            return EXIT_FAILURE;
-        default:
-        case Command::unknown: break;
-        }
-        break;
-    }
-    case Property::unknown:
-        std::cout << "Unknown property, aborting now." << std::endl;
-        location::service::Daemon::Cli::print_help(std::cout);
-        return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}
-
-/** @brief Parses a Cli property from the given input stream, throws std::runtime_error. */
-std::istream& location::service::operator>>(std::istream& in, location::service::Daemon::Cli::Property& property)
-{
-    static const std::map<std::string, location::service::Daemon::Cli::Property> lut =
-    {
-        {"state", location::service::Daemon::Cli::Property::state},
-        {"is_online", location::service::Daemon::Cli::Property::is_online},
-        {"does_satellite_based_positioning", location::service::Daemon::Cli::Property::does_satellite_based_positioning},
-        {"does_report_wifi_and_cell_ids", location::service::Daemon::Cli::Property::does_report_wifi_and_cell_ids},
-        {"visible_space_vehicles", location::service::Daemon::Cli::Property::visible_space_vehicles}
-    };
-
-    std::string value; in >> value;
-
-    auto it = lut.find(value);
-
-    if (it == lut.end()) throw std::runtime_error
-    {
-        "Unknown property specified: " + value
-    };
-
-    property = it->second;
-    return in;
-}
-
-/** @brief Parses a Cli property from the given input stream, throws std::runtime_error. */
-std::ostream& location::service::operator<<(std::ostream& out, location::service::Daemon::Cli::Property property)
-{
-    switch (property)
-    {
-    case location::service::Daemon::Cli::Property::state:
-        out << "state"; break;
-    case location::service::Daemon::Cli::Property::is_online:
-        out << "is_online"; break;
-    case location::service::Daemon::Cli::Property::does_satellite_based_positioning:
-        out << "does_satellite_based_positioning"; break;
-    case location::service::Daemon::Cli::Property::does_report_wifi_and_cell_ids:
-        out << "does_report_wifi_and_cell_ids"; break;
-    case location::service::Daemon::Cli::Property::visible_space_vehicles:
-        out << "visible_space_vehicles"; break;
-    case location::service::Daemon::Cli::Property::unknown:
-        out << "unknown"; break;
-    }
-
-    return out;
-}

=== removed file 'src/location/service/daemon.h'
--- src/location/service/daemon.h	2016-06-26 21:17:03 +0000
+++ src/location/service/daemon.h	1970-01-01 00:00:00 +0000
@@ -1,184 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_DAEMON_H_
-#define LOCATION_SERVICE_DAEMON_H_
-
-#include <location/configuration.h>
-#include <location/engine.h>
-#include <location/settings.h>
-
-#include <location/service/dbus_connection_factory.h>
-
-#include <iosfwd>
-#include <string>
-
-namespace location
-{
-namespace service
-{
-/**
- * @brief The Daemon struct encapsulates main functions for the location service and its cli.
- */
-struct Daemon
-{
-    /** @brief Describes the command-line interface to the daemon. */
-    struct Cli
-    {
-        Cli() = delete;
-
-        /** @brief Enumerates all commands known to the cli. */
-        enum class Command
-        {
-            /** @brief Marks the unknown command. */
-            unknown,
-            /** @brief Request to query a property value of the running service. */
-            get,
-            /** @brief Request to adjust a property value of the running service. */
-            set,
-            /** @brief Executes runtime tests. */
-            test
-        };
-
-        /** @brief Enumerates all properties known to the cli. */
-        enum class Property
-        {
-            /** @brief Marks the unknown property. */
-            unknown,
-            /** @brief State describes the overall state of the service. */
-            state,
-            /** @brief Indicates whether the positioning engine is online. */
-            is_online,
-            /** @brief Indicates whether the positioning engine uses satellite-based positioning. */
-            does_satellite_based_positioning,
-            /** @brief Indicates whether the positioning engine leverages wifi and cell ids for positioning. */
-            does_report_wifi_and_cell_ids,
-            /** @brief The list of currently visible space-vehicles. */
-            visible_space_vehicles
-        };
-
-        /** @brief Parameters for an invocation of the CLI. */
-        struct Configuration
-        {
-            /** @brief Parses a configuration from the command line.
-             *
-             * --bus arg (=session)      The well-known bus to connect to the service upon
-             * --help                    Produces this help message
-             * --property arg (=unknown) Property to set/get from a running service, known
-                                         properties are:
-                                            state [get]
-                                            is_online [get/set]
-                                            does_satellite_based_positioning [get/set]
-                                            does_report_wifi_and_cell_ids [get/set]
-                                            visible_space_vehicles [get]
-             * --set arg                 Adjust the value of the property.
-             * --get                     Query the value of the property.
-             * --test                    Executes runtime tests.
-             */
-            static Configuration from_command_line_args(
-                    int argc,
-                    const char** argv,
-                    DBusConnectionFactory factory = default_dbus_connection_factory());
-
-            /** @brief The bus to connect to. */
-            core::dbus::Bus::Ptr bus;
-
-            /** @brief The command to execute against a running daemon. */
-            Command command
-            {
-                Command::unknown
-            };
-
-            /** @brief If command is get/set/monitor, the property to act upon. */
-            Property property
-            {
-                Property::unknown
-            };
-
-            /** @brief The new, string-based value for a property. */
-            std::string new_value;
-        };
-
-        /** @brief Pretty-prints the CLI's help text to the given output stream. */
-        static void print_help(std::ostream& out);
-
-        /**
-         * @brief main of the command-line interface to the location service.
-         * @return EXIT_SUCCESS or EXIT_FAILURE.
-         */
-        static int main(const Configuration& configuration);
-    };
-
-    Daemon() = delete;
-
-    /** @brief Parameters for an invocation of the daemon. */
-    struct Configuration
-    {
-        /** @brief Parses a configuration from the command line.
-         *
-         *   --bus arg (=session)  The well-known bus to connect to the service upon
-         *   --help                Produces this help message
-         *   --testing             Enables executing the service without selected providers
-         *   --provider arg        The providers that should be added to the engine
-         *   --config-file arg     The config file we should read from/write to
-         */
-        static Configuration from_command_line_args(
-                int argc,
-                const char** argv,
-                DBusConnectionFactory factory = default_dbus_connection_factory());
-
-        /** @brief The bus to expose the service upon. */
-        core::dbus::Bus::Ptr incoming;
-
-        /** @brief The bus to use for querying other services. */
-        core::dbus::Bus::Ptr outgoing;
-
-        /** @brief Configures the daemon for testing mode. */
-        bool is_testing_enabled
-        {
-            false
-        };
-        /** @brief Providers that have been requested on the command line. */
-        std::vector<std::string> providers;
-        /** @brief Provider-specific options keyed on the provider name. */
-        std::map< std::string, location::Configuration > provider_options;
-        /** @brief Settings instance to read values from. */
-        Settings::Ptr settings;
-    };
-
-    /** @brief Pretty-prints the CLI's help text to the given output stream. */
-    static void print_help(std::ostream& out);
-
-    /** @brief Instantiates and configures each provider selected in the config */
-    static void load_providers(const Configuration& config, std::shared_ptr<location::Engine> engine);
-
-    /**
-     * @brief Executes the daemon with the given configuration.
-     * @return EXIT_SUCCESS or EXIT_FAILURE.
-     */
-    static int main(const Configuration& config);
-};
-
-/** @brief Parses a Cli property from the given input stream, throws std::runtime_error. */
-std::istream& operator>>(std::istream& in, Daemon::Cli::Property& property);
-
-/** @brief Pretty-prints a property value */
-std::ostream& operator<<(std::ostream& out, Daemon::Cli::Property property);
-}
-}
-
-#endif // LOCATION_SERVICE_DAEMON_H_

=== removed file 'src/location/service/daemon_cli_main.cpp'
--- src/location/service/daemon_cli_main.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/daemon_cli_main.cpp	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2012-2013 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 PARTIlocationAR 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: Thomas Voß <[e-mail]>
- */
-
-#include "daemon.h"
-
-#include <location/logging.h>
-
-#include <iostream>
-#include <stdexcept>
-
-int main(int argc, const char** argv)
-{
-    // Setup logging for the CLI.
-    FLAGS_logtostderr = true;
-    google::InitGoogleLogging("com.ubuntu.location");
-
-    location::service::Daemon::Cli::Configuration config;
-    try
-    {
-        config = location::service::Daemon::Cli::Configuration::from_command_line_args(argc, argv);
-    } catch(const std::runtime_error& e)
-    {
-        std::cout << "Problem parsing command line: " << e.what() << std::endl;
-        location::service::Daemon::Cli::print_help(std::cout);
-        return EXIT_FAILURE;
-    }
-
-    try
-    {
-        location::service::Daemon::Cli::main(config);
-    } catch(const std::exception& e)
-    {
-        std::cout << "Problem executing the CLI: " << e.what() << std::endl;
-        return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}

=== removed file 'src/location/service/daemon_main.cpp'
--- src/location/service/daemon_main.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/daemon_main.cpp	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2012-2013 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 PARTIlocationAR 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: Thomas Voß <[e-mail]>
- */
-
-#include "daemon.h"
-
-int main(int argc, const char** argv)
-{
-    location::service::Daemon::Configuration config;
-    try
-    {
-        config = location::service::Daemon::Configuration::from_command_line_args(argc, argv);
-    } catch(const std::runtime_error& e)
-    {
-        std::cerr << "Problem parsing command line: " << e.what();
-        location::service::Daemon::print_help(std::cerr);
-        return EXIT_FAILURE;
-    }
-
-    try
-    {
-        location::service::Daemon::main(config);
-        config.settings->sync();
-    } catch(const std::exception& e)
-    {
-        std::cout << "Problem executing the daemon: " << e.what() << std::endl;
-        return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}

=== removed file 'src/location/service/dbus_connection_factory.h'
--- src/location/service/dbus_connection_factory.h	2016-06-26 21:17:03 +0000
+++ src/location/service/dbus_connection_factory.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_DBUS_CONNECTION_FACTORY_H_
-#define LOCATION_SERVICE_DBUS_CONNECTION_FACTORY_H_
-
-#include <core/dbus/bus.h>
-
-#include <functional>
-
-namespace location
-{
-namespace service
-{
-/** @brief Function signature for creating DBus connections. */
-typedef std::function<core::dbus::Bus::Ptr(core::dbus::WellKnownBus)> DBusConnectionFactory;
-
-/** @brief Returns the default connection factory. */
-static DBusConnectionFactory default_dbus_connection_factory()
-{
-    return [](core::dbus::WellKnownBus bus)
-    {
-        return core::dbus::Bus::Ptr
-        {
-            new core::dbus::Bus(bus)
-        };
-    };
-}
-}
-}
-
-#endif // LOCATION_SERVICE_DBUS_CONNECTION_FACTORY_H_

=== removed file 'src/location/service/default_configuration.cpp'
--- src/location/service/default_configuration.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/default_configuration.cpp	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include <location/service/default_configuration.h>
-#include <location/service/default_permission_manager.h>
-#include <location/service/trust_store_permission_manager.h>
-
-#include <location/engine.h>
-#include <location/fusion_provider_selection_policy.h>
-
-location::Engine::Ptr location::service::DefaultConfiguration::the_engine(
-    const std::set<location::Provider::Ptr>& provider_set,
-    const location::ProviderSelectionPolicy::Ptr& provider_selection_policy,
-    const location::Settings::Ptr& settings)
-{
-    auto engine = std::make_shared<location::Engine>(provider_selection_policy, settings);
-    for (const auto& provider : provider_set)
-        engine->add_provider(provider);
-
-    return engine;
-}
-
-location::ProviderSelectionPolicy::Ptr location::service::DefaultConfiguration::the_provider_selection_policy()
-{
-    return std::make_shared<location::FusionProviderSelectionPolicy>();
-}
-
-std::set<location::Provider::Ptr> location::service::DefaultConfiguration::the_provider_set(
-    const location::Provider::Ptr& seed)
-{
-    return std::set<location::Provider::Ptr>{seed};
-}
-
-location::service::PermissionManager::Ptr location::service::DefaultConfiguration::the_permission_manager(const core::dbus::Bus::Ptr& bus)
-{
-    return location::service::TrustStorePermissionManager::create_default_instance_with_bus(bus);
-}
-

=== removed file 'src/location/service/default_configuration.h'
--- src/location/service/default_configuration.h	2016-06-26 21:17:03 +0000
+++ src/location/service/default_configuration.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_DEFAULT_CONFIGURATION_H_
-#define LOCATION_SERVICE_DEFAULT_CONFIGURATION_H_
-
-#include <location/service/configuration.h>
-
-#include <location/settings.h>
-
-#include <set>
-
-#include <core/dbus/bus.h>
-
-namespace location
-{
-namespace service
-{
-// A helper class to create dependencies of the service implementation.
-class DefaultConfiguration
-{
-public:
-    DefaultConfiguration() = default;
-    virtual ~DefaultConfiguration() = default;
-
-    // Creates a policy instance for selecting a set of providers given a criteria
-    // as specified by a client application.
-    virtual ProviderSelectionPolicy::Ptr the_provider_selection_policy();
-
-    // Returns a set of providers, seeded with the seed provider if it is not null.
-    virtual std::set<Provider::Ptr> the_provider_set(const Provider::Ptr& seed = Provider::Ptr {});
-
-    // Creates an engine instance given a set of providers, a provider selection policy
-    // and a settings instance.
-    virtual std::shared_ptr<Engine> the_engine(
-        const std::set<Provider::Ptr>& provider_set,
-        const ProviderSelectionPolicy::Ptr& provider_selection_policy,
-        const Settings::Ptr& settings);
-
-    // Instantiates an instance of the permission manager.
-    virtual PermissionManager::Ptr the_permission_manager(const std::shared_ptr<core::dbus::Bus>& bus);
-};
-}
-}
-
-#endif // LOCATION_SERVICE_DEFAULT_CONFIGURATION_H_

=== removed file 'src/location/service/default_permission_manager.cpp'
--- src/location/service/default_permission_manager.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/default_permission_manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include <location/service/default_permission_manager.h>
-
-#include <iostream>
-
-location::service::DefaultPermissionManager::DefaultPermissionManager()
-    : pid(getpid()),
-      uid(getuid())
-{
-}
-
-location::service::DefaultPermissionManager::~DefaultPermissionManager() noexcept
-{
-}
-
-location::service::PermissionManager::Result location::service::DefaultPermissionManager::check_permission_for_credentials(
-    const location::Criteria&,
-    const location::service::Credentials& credentials)
-{
-    if (credentials.pid != pid || credentials.uid != uid)
-        return Result::granted; // FIXME(tvoss): This should return rejected.
-    return Result::granted;
-}

=== removed file 'src/location/service/default_permission_manager.h'
--- src/location/service/default_permission_manager.h	2016-06-28 11:53:34 +0000
+++ src/location/service/default_permission_manager.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
-#define LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_
-
-#include <location/service/permission_manager.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-namespace location
-{
-namespace service
-{
-class DefaultPermissionManager : public PermissionManager
-{
-  public:
-    typedef std::shared_ptr<DefaultPermissionManager> Ptr;
-
-    DefaultPermissionManager();
-    ~DefaultPermissionManager() noexcept;
-    
-    Result check_permission_for_credentials(
-    	const Criteria&,
-        const Credentials& credentials);
-
-  private:
-    pid_t pid;
-    uid_t uid;
-};
-}
-}
-
-#endif // LOCATION_SERVICE_DEFAULT_PERMISSION_MANAGER_H_

=== removed file 'src/location/service/demultiplexing_reporter.cpp'
--- src/location/service/demultiplexing_reporter.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/demultiplexing_reporter.cpp	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-
-#include <location/service/demultiplexing_reporter.h>
-
-location::service::DemultiplexingReporter::DemultiplexingReporter(const std::set<location::service::Harvester::Reporter::Ptr>& reporters)
-    : reporters{reporters}
-{
-
-}
-
-// Tell the reporters that it should start operating.
-void location::service::DemultiplexingReporter::start()
-{
-    std::lock_guard<std::mutex> lg{reporters_guard};
-    for(auto reporter : reporters)
-        reporter->start();
-}
-
-// Tell the reporters to shut down its operation.
-void location::service::DemultiplexingReporter::stop()
-{
-    std::lock_guard<std::mutex> lg{reporters_guard};
-    for(auto reporter : reporters)
-        reporter->stop();
-}
-
-// Triggers the reporters to send off the information.
-void location::service::DemultiplexingReporter::report(
-        const location::Update<location::Position>& update,
-        const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-        const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells)
-{
-    std::lock_guard<std::mutex> lg{reporters_guard};
-    for(auto reporter : reporters)
-        reporter->report(update, wifis, cells);
-}

=== removed file 'src/location/service/demultiplexing_reporter.h'
--- src/location/service/demultiplexing_reporter.h	2016-06-26 21:17:03 +0000
+++ src/location/service/demultiplexing_reporter.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_DEMULTIPLEXING_REPORTER_H_
-#define LOCATION_SERVICE_DEMULTIPLEXING_REPORTER_H_
-
-#include <location/service/harvester.h>
-
-namespace location{namespace service
-{
-
-// A simple demultiplexer, distributing updates to a set of
-// actual reporter implementations.
-class DemultiplexingReporter : public Harvester::Reporter
-{
-public:
-    DemultiplexingReporter(const std::set<Harvester::Reporter::Ptr>& reporters);
-
-    // Tell the reporters that it should start operating.
-    void start() override;
-
-    // Tell the reporters to shut down its operation.
-    void stop() override;
-
-    // Triggers the reporters to send off the information.
-    void report(const Update<Position>& update,
-                const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-                const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells) override;
-private:
-    std::mutex reporters_guard;
-    std::set<Harvester::Reporter::Ptr> reporters;
-};
-}}
-
-#endif // LOCATION_SERVICE_DEMULTIPLEXING_REPORTER_H_

=== removed file 'src/location/service/harvester.cpp'
--- src/location/service/harvester.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/harvester.cpp	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-
-#include <location/service/harvester.h>
-
-#include <location/logging.h>
-
-location::service::Harvester::Harvester(const location::service::Harvester::Configuration& configuration)
-    : config(configuration),
-      is_running{false}
-{
-}
-
-location::service::Harvester::~Harvester()
-{
-    stop();
-}
-
-/** @brief Report updated position to the harvester instance. */
-void location::service::Harvester::report_position_update(const location::Update<location::Position>& update)
-{
-    VLOG(10) << "Reference location changed: " << update;
-
-    if (not is_running.load())
-        return;
-
-    std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr> visible_wifis;
-    config.connectivity_manager->enumerate_visible_wireless_networks([&visible_wifis](com::ubuntu::location::connectivity::WirelessNetwork::Ptr wifi)
-    {
-        VLOG(10) << "Got a visible wifi: " << *wifi << std::endl;
-        visible_wifis.push_back(wifi);
-    });
-
-    std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr> connected_cells;
-    config.connectivity_manager->enumerate_connected_radio_cells([&connected_cells](com::ubuntu::location::connectivity::RadioCell::Ptr cell)
-    {
-        VLOG(10) << "Got a cell: " << *cell << std::endl;
-        connected_cells.push_back(cell);
-    });
-
-    config.reporter->report(update, visible_wifis, connected_cells);
-}
-
-void location::service::Harvester::start()
-{
-    if (is_running.load())
-        return;
-
-    is_running.exchange(true);
-
-    config.reporter->start();
-}
-
-void location::service::Harvester::stop()
-{
-    if (not is_running.load())
-        return;
-
-    is_running.exchange(false);
-
-    config.reporter->stop();
-}

=== removed file 'src/location/service/harvester.h'
--- src/location/service/harvester.h	2016-06-26 21:17:03 +0000
+++ src/location/service/harvester.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_HARVESTER_H_
-#define LOCATION_SERVICE_HARVESTER_H_
-
-#include <location/engine.h>
-#include <location/update.h>
-#include <location/connectivity/manager.h>
-
-namespace location
-{
-namespace service
-{
-/** @brief Models a wifi- and cell-id harvester for crowd-sourcing purposes. */
-class Harvester
-{
-public:
-
-    /** @brief Models a reporter of position updates, augmented with wifi and cell ids. */
-    struct Reporter
-    {
-        /** @cond */
-        typedef std::shared_ptr<Reporter> Ptr;
-
-        Reporter() = default;
-        virtual ~Reporter() = default;
-        /** @endcond */
-
-        /** @brief Tell the reporter that it should start operating. */
-        virtual void start() = 0;
-
-        /** @brief Tell the reporter to shut down its operation. */
-        virtual void stop() = 0;
-
-        /**
-         * @brief Triggers the reporter to send off the information.
-         */
-        virtual void report(const Update<Position>& update,
-                            const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-                            const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells) = 0;
-    };
-
-    /** @brief Configuration encapsulates all creation time options of class Harvester */
-    struct Configuration
-    {
-        /** The connectivity manager that the harvester should use. */
-        std::shared_ptr<com::ubuntu::location::connectivity::Manager> connectivity_manager;
-        /** The reporter implementation */
-        std::shared_ptr<Reporter> reporter;
-    };
-
-    /** @brief Creates a new instance and wires up to system components for receiving
-     *  location updates, and wifi and cell id measurements.
-     */
-    Harvester(const Configuration& configuration);
-
-    /** @brief Stops the data collection and frees all resources held by the instance. */
-    virtual ~Harvester();
-
-    /** @brief Report updated position to the harvester instance. */
-    virtual void report_position_update(const Update<Position>& update);
-
-    /** @brief Starts the harvester instance and its data collection. */
-    virtual void start();
-
-    /** @brief Stops the harvester instance and its data collection. */
-    virtual void stop();
-
-private:
-    Configuration config;
-    std::atomic<bool> is_running;
-};
-}
-}
-
-#endif // LOCATION_SERVICE_HARVESTER_H_

=== removed file 'src/location/service/ichnaea_reporter.cpp'
--- src/location/service/ichnaea_reporter.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/ichnaea_reporter.cpp	1970-01-01 00:00:00 +0000
@@ -1,405 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-
-#include <json.h>
-
-#include <location/service/ichnaea_reporter.h>
-
-#include <location/logging.h>
-
-#include <core/net/http/client.h>
-#include <core/net/http/content_type.h>
-#include <core/net/http/request.h>
-#include <core/net/http/response.h>
-#include <core/net/http/status.h>
-
-#include <thread>
-
-namespace json
-{
-Object Object::parse_from_string(const std::string& s)
-{
-    return Object{json_tokener_parse(s.c_str())};
-}
-
-Object Object::create_array()
-{
-    return Object{json_object_new_array()};
-}
-
-Object Object::create_object()
-{
-    return Object{json_object_new_object()};
-}
-
-Object::Object(json_object* object) : object(object)
-{
-}
-
-Object::Object(const Object& rhs) : object(json_object_get(rhs.object))
-{
-}
-
-Object::~Object()
-{
-    json_object_put(object);
-}
-
-Object& Object::operator=(const Object& rhs)
-{
-    json_object_put(object);
-    object = json_object_get(rhs.object);
-
-    return *this;
-}
-
-std::string Object::to_plain_string()
-{
-    return std::string
-    {
-        json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN)
-    };
-}
-
-Object Object::get(const std::string& name) const
-{
-    json_object* result{nullptr};
-
-    json_object_object_get_ex(object, name.c_str(), &result);
-
-    if (not result) throw std::out_of_range
-    {
-        name.c_str()
-    };
-
-    return Object{result};
-}
-
-namespace
-{
-template<json_type type> void throw_if_type_mismatch(json_object* object)
-{
-    if (not json_object_is_type(object, type)) throw std::logic_error
-    {
-        "Type mismatch."
-    };
-}
-}
-// Attempts to resolve the object to a boolean value.
-// Throws std::logic_error in case of type mismatches.
-bool Object::to_bool() const
-{
-    throw_if_type_mismatch<json_type_boolean>(object);
-    return json_object_get_boolean(object);
-}
-
-std::int32_t Object::to_int32() const
-{
-    throw_if_type_mismatch<json_type_int>(object);
-    return json_object_get_int(object);
-}
-
-std::int64_t Object::to_int64() const
-{
-    throw_if_type_mismatch<json_type_int>(object);
-    return json_object_get_int64(object);
-}
-
-double Object::to_double() const
-{
-    if (json_object_is_type(object, json_type_double))
-        return json_object_get_double(object);
-    if (json_object_is_type(object, json_type_int))
-        return json_object_get_int(object);
-
-    throw std::logic_error{"Type mismatch"};
-}
-
-std::string Object::to_string() const
-{
-    throw_if_type_mismatch<json_type_string>(object);
-    return std::string{json_object_get_string(object)};
-}
-
-void Object::put_array(const std::string& name, Object array)
-{
-    json_object_object_add(object, name.c_str(), json_object_get(array.object));
-}
-
-void Object::put_object(const std::string& name, Object other)
-{
-    json_object_object_add(object, name.c_str(), json_object_get(other.object));
-}
-
-void Object::put_boolean(const std::string& name, bool value)
-{
-    json_object_object_add(object, name.c_str(), json_object_new_boolean(value));
-}
-
-void Object::put_int32(const std::string& name, std::int32_t value)
-{
-    json_object_object_add(object, name.c_str(), json_object_new_int(value));
-}
-
-void Object::put_int64(const std::string& name, std::int64_t value)
-{
-    json_object_object_add(object, name.c_str(), json_object_new_int64(value));
-}
-
-void Object::put_double(const std::string& name, double value)
-{
-    json_object_object_add(object, name.c_str(), json_object_new_double(value));
-}
-
-void Object::put_string(const std::string& name, const std::string& value)
-{
-    json_object_object_add(object, name.c_str(), json_object_new_string_len(value.c_str(), value.size()));
-}
-
-std::size_t Object::array_size() const
-{
-    throw_if_type_mismatch<json_type_array>(object);
-    return json_object_array_length(object);
-}
-
-void Object::append(Object other)
-{
-    throw_if_type_mismatch<json_type_array>(object);
-    json_object_array_add(object, json_object_get(other.object));
-}
-
-void Object::put_object_for_index(std::size_t index, Object other)
-{
-    throw_if_type_mismatch<json_type_array>(object);
-    json_object_array_put_idx(object, index, json_object_get(other.object));
-}
-
-// Queries the object at index 'index'.
-// Throws std::logic_error if the object does not represent an array.
-// Throws std::out_of_range if the index exceeds the bounds of the array.
-Object Object::get_object_for_index(std::size_t index)
-{
-    throw_if_type_mismatch<json_type_array>(object);
-    return Object
-    {
-        json_object_get(json_object_array_get_idx(object, index))
-    };
-}
-}
-
-location::service::ichnaea::Reporter::Reporter(
-        const location::service::ichnaea::Reporter::Configuration& configuration)
-    : http_client(core::net::http::make_client())
-{
-    auto uri = configuration.uri +
-            ichnaea::submit::resource +
-            configuration.key;
-
-    submit_request_config = core::net::http::Request::Configuration::from_uri_as_string(uri);
-    submit_request_config.ssl.verify_host = false;
-    submit_request_config.ssl.verify_peer = false;
-
-    if (not configuration.nick_name.empty())
-        submit_request_config.header.add(Reporter::nick_name_header, configuration.nick_name);
-}
-
-location::service::ichnaea::Reporter::~Reporter()
-{
-    stop();
-}
-
-void location::service::ichnaea::Reporter::start()
-{
-    http_client_worker = std::move(
-                std::thread
-                {
-                    [this]()
-                    {
-                        http_client->run();
-                    }
-                });
-}
-
-void location::service::ichnaea::Reporter::stop()
-{
-    http_client->stop();
-
-    if (http_client_worker.joinable())
-        http_client_worker.join();
-}
-
-void location::service::ichnaea::Reporter::report(
-        const location::Update<location::Position>& update,
-        const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-        const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells)
-{
-    json::Object submit = json::Object::create_object();
-    json::Object items = json::Object::create_array();
-    json::Object item = json::Object::create_object();
-
-    item.put_string(Json::radio, "gsm"); // We currently only support gsm radio types.
-    item.put_double(Json::lat, update.value.latitude.value.value());
-    item.put_double(Json::lon, update.value.longitude.value.value());
-
-    if (update.value.accuracy.horizontal)
-        item.put_double(Json::accuracy, (*update.value.accuracy.horizontal).value());
-    if (update.value.altitude)
-        item.put_double(Json::altitude, (*update.value.altitude).value.value());
-    if (update.value.accuracy.vertical)
-        item.put_double(Json::altitude_accuracy, (*update.value.accuracy.vertical).value());
-
-    if (!wifis.empty())
-    {
-        json::Object w = json::Object::create_array();
-        ichnaea::Reporter::convert_wifis_to_json(wifis, w);
-        item.put_array(Json::wifi, w);
-    }
-
-    if (!cells.empty())
-    {
-        json::Object c = json::Object::create_array();
-        ichnaea::Reporter::convert_cells_to_json(cells, c);
-        item.put_array(Json::cell, c);
-    }
-
-    items.append(item);
-    submit.put_array(Json::items, items);
-
-    auto string_representation = submit.to_plain_string();
-
-    VLOG(10) << "Submitting: " << string_representation;
-
-    auto request = http_client->post(
-                submit_request_config,
-                string_representation,
-                core::net::http::ContentType::json);
-
-    request->async_execute(
-                core::net::http::Request::Handler()
-                .on_response([](const core::net::http::Response& response)
-                {
-                    if (response.status != ichnaea::submit::success)
-                        SYSLOG(ERROR) << "Error submitting to ichnaea: " << response.body;
-                    else
-                        VLOG(1) << "Succesfully submitted to ichnaea.";
-                })
-                .on_error([](const core::net::Error& e)
-                {
-                    SYSLOG(ERROR) << "Networking error while submitting to ichnaea: " << e.what();
-                }));
-}
-
-void location::service::ichnaea::Reporter::convert_wifis_to_json(
-        const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-        json::Object& destination)
-{
-    for (const auto& wifi : wifis)
-    {
-        // We do not harvest any Wifi marked with '_nomap'.
-        if (wifi->ssid().get().find("_nomap") != std::string::npos)
-            continue;
-
-        json::Object w = json::Object::create_object();
-        w.put_string(Json::Wifi::key, wifi->bssid().get());
-
-        if (wifi->frequency().get().is_valid())
-            w.put_int32(Json::Wifi::frequency, static_cast<int>(wifi->frequency().get()));
-
-        // We have a relative signal strength percentage in the wifi record.
-        // TODO(tvoss): Check how that could be translated to RSSI.
-        //wifi[Json::Wifi::signal] = -50;
-
-        destination.append(w);
-    }
-}
-
-void location::service::ichnaea::Reporter::convert_cells_to_json(
-        const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells,
-        json::Object& destination)
-{
-    for (const auto& cell : cells)
-    {
-        json::Object c = json::Object::create_object();
-
-        switch (cell->type())
-        {
-        case com::ubuntu::location::connectivity::RadioCell::Type::gsm:
-        {
-            c.put_string(Json::Cell::radio, "gsm");
-
-            const auto& details = cell->gsm();
-
-            if (details.mobile_country_code.is_valid())
-                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
-            if (details.mobile_network_code.is_valid())
-                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
-            if (details.location_area_code.is_valid())
-                c.put_int32(Json::Cell::lac, details.location_area_code.get());
-            if (details.id.is_valid())
-                c.put_int32(Json::Cell::cid, details.id.get());
-            if  (details.strength.is_valid())
-                c.put_int32(Json::Cell::asu, details.strength.get());
-
-            break;
-        }
-        case com::ubuntu::location::connectivity::RadioCell::Type::umts:
-        {
-            c.put_string(Json::Cell::radio, "umts");
-
-            const auto& details = cell->umts();
-
-            if (details.mobile_country_code.is_valid())
-                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
-            if (details.mobile_network_code.is_valid())
-                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
-            if (details.location_area_code.is_valid())
-                c.put_int32(Json::Cell::lac, details.location_area_code.get());
-            if (details.id.is_valid())
-                c.put_int32(Json::Cell::cid, details.id.get());
-            if  (details.strength.is_valid())
-                c.put_int32(Json::Cell::asu, details.strength.get());
-
-            break;
-        }
-        case com::ubuntu::location::connectivity::RadioCell::Type::lte:
-        {
-            c.put_string(Json::Cell::radio, "lte");
-
-            const auto& details = cell->lte();
-
-            if (details.mobile_country_code.is_valid())
-                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
-            if (details.mobile_network_code.is_valid())
-                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
-            if (details.tracking_area_code.is_valid())
-                c.put_int32(Json::Cell::lac, details.tracking_area_code.get());
-            if (details.id.is_valid())
-                c.put_int32(Json::Cell::cid, details.id.get());
-            if (details.physical_id.is_valid())
-                c.put_int32(Json::Cell::psc, details.physical_id.get());
-            if  (details.strength.is_valid())
-                c.put_int32(Json::Cell::asu, details.strength.get());
-            break;
-        }
-        default:
-            break;
-        }
-
-        destination.append(c);
-    }
-}

=== removed file 'src/location/service/ichnaea_reporter.h'
--- src/location/service/ichnaea_reporter.h	2016-06-26 21:17:03 +0000
+++ src/location/service/ichnaea_reporter.h	1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_ICHNAEA_REPORTER_H_
-#define LOCATION_SERVICE_ICHNAEA_REPORTER_H_
-
-#include <location/service/harvester.h>
-
-#include <core/net/http/client.h>
-#include <core/net/http/content_type.h>
-#include <core/net/http/request.h>
-#include <core/net/http/response.h>
-#include <core/net/http/status.h>
-
-#include <thread>
-
-// Forward declare the opaque json_object handle from json-c here.
-struct json_object;
-
-// We are wrapping libjson-c and introduce a generic Object type for that purpose.
-namespace json
-{
-// For internal purposes only
-class Object
-{
-public:
-    // Parses a new object from the given string.
-    // Throws std::runtime_error in case of parsing errors.
-    static Object parse_from_string(const std::string& s);
-    // Creates a new object of type array.
-    static Object create_array();
-    // Creates a new object of type object.
-    static Object create_object();
-
-    // Shallow copy, only increments reference count.
-    Object(const Object& rhs);
-    // Decrements the reference count of the object.
-    ~Object();
-
-    // Shallow copy, decrements reference count of this object,
-    // increments reference count of object contained in rhs.
-    Object& operator=(const Object& rhs);
-
-    // Encodes this object instance as a valid JSON string without any
-    // unneccessary whitespace
-    std::string to_plain_string();
-
-    // Resolves the object with the given name.
-    // Throws std::out_of_range if no object with the given name is known.
-    Object get(const std::string& name) const;
-
-    // Attempts to resolve the object to a boolean value.
-    // Throws std::logic_error in case of type mismatches.
-    bool to_bool() const;
-    // Attempts to resolve the object to an integer value of 32bit width.
-    // Throws std::logic_error in case of type mismatches.
-    std::int32_t to_int32() const;
-    // Attempts to resolve the object to an integer value of 64bit width.
-    // Throws std::logic_error in case of type mismatches.
-    std::int64_t to_int64() const;
-    // Attempts to resolve the object to a floating point value.
-    // Throws std::logic_error in case of type mismatches.
-    double to_double() const;
-    // Attempts to resolve the object to a string value.
-    // Throws std::logic_error in case of type mismatches.
-    std::string to_string() const;
-
-    // Adds the given array under the given name to this object instance.
-    void put_array(const std::string& name, Object array);
-    // Adds the given object under the given name to this object instance.
-    void put_object(const std::string& name, Object other);
-    // Adds the given boolean under the given name to this object instance.
-    void put_boolean(const std::string& name, bool value);
-    // Adds the given integer under the given name to this object instance.
-    void put_int32(const std::string& name, std::int32_t value);
-    // Adds the given integer under the given name to this object instance.
-    void put_int64(const std::string& name, std::int64_t value);
-    // Adds the given floating point value under the given name to this object instance.
-    void put_double(const std::string& name, double value);
-    // Adds the given string value under the given name to this object instance.
-    void put_string(const std::string& name, const std::string& value);
-
-    // Only valid for array objects
-    // Returns the size of the array, throws std::logic_error if the object
-    // does not represent an array.
-    std::size_t array_size() const;
-    // Appends an object to the end of the array, throws std::logic_error if
-    // the object does not represent an array.
-    void append(Object other);
-    // Replaces the object at index 'index' with the given instance.
-    // Throws std::logic_error if the object does not represent an array.
-    // Throws std::out_of_range if the index exceeds the bounds of the array.
-    void put_object_for_index(std::size_t index, Object other);
-    // Queries the object at index 'index'.
-    // Throws std::logic_error if the object does not represent an array.
-    // Throws std::out_of_range if the index exceeds the bounds of the array.
-    Object get_object_for_index(std::size_t index);
-
-private:
-    Object(json_object* object);
-    json_object* object;
-};
-}
-
-namespace location{ namespace service
-{
-/**
- * @brief All types and functions that are used to communicate with instances
- * of the Mozilla location service go here. Please see for further details:
- *
- *   - https://mozilla-ichnaea.readthedocs.org/en/latest/api/index.html#submit
- *   - https://github.com/mozilla/MozStumbler
- */
-namespace ichnaea
-{
-namespace submit
-{
-/** @brief Resource path for wifi- and cell-id submissions.  */
-constexpr const char* resource
-{
-    "/v1/submit?key="
-};
-/** @brief Http code marking errors for Mozilla location service instances. */
-const core::net::http::Status error
-{
-    core::net::http::Status::bad_request
-};
-/** @brief Http code marking a successful submission request to Mozilla location service instances. */
-const core::net::http::Status success
-{
-    core::net::http::Status::no_content
-};
-}
-
-struct Reporter : public Harvester::Reporter
-{
-    /** @brief Submissions can be tagged with a nick-name for tracking on leaderboards. */
-    static constexpr const char* nick_name_header{"X-Nickname"};
-
-    /** @brief The JSON-dialect of the Mozilla location service is described here. */
-    struct Json
-    {
-        static constexpr const char* radio{"radio"};
-        static constexpr const char* lat{"lat"};
-        static constexpr const char* lon{"lon"};
-        static constexpr const char* accuracy{"accuracy"};
-        static constexpr const char* altitude{"altitude"};
-        static constexpr const char* altitude_accuracy{"altitude_accuracy"};
-
-        static constexpr const char* items{"items"};
-
-        static constexpr const char* cell{"cell"};
-        static constexpr const char* wifi{"wifi"};
-
-        struct Cell
-        {
-            static constexpr const char* radio{"radio"};
-            static constexpr const char* mcc{"mcc"};
-            static constexpr const char* mnc{"mnc"};
-            static constexpr const char* lac{"lac"};
-            static constexpr const char* cid{"cid"};
-            static constexpr const char* psc{"psc"};
-            static constexpr const char* asu{"asu"};
-        };
-
-        struct Wifi
-        {
-            static constexpr const char* channel{"channel"};
-            static constexpr const char* frequency{"frequency"};
-            static constexpr const char* key{"key"};
-            static constexpr const char* signal{"signal"};
-        };
-    };
-
-    /** Creation-time options for the ICHNAEA reporter */
-    struct Configuration
-    {
-        /** Uri of the ICHNAEA instance we want to submit to. */
-        std::string uri;
-        /** API key for the submission */
-        std::string key;
-        /** Nickname for the submission */
-        std::string nick_name;
-    };
-
-    /** @brief Constructs a new instance with the given parameters. */
-    Reporter(const Configuration& configuration);
-    /** @brief Stops the reporter instance and frees all related resources. */
-    ~Reporter();
-
-    /** @brief Starts the reporter and prepares for submission. */
-    void start() override;    
-    /** @brief Stops the reporter. */
-    void stop() override;
-
-    /**
-     * @brief Announced a position update, together with visible wifis and cells to the reporter.
-     * @throws std::runtime_error if wifis and cells are empty.
-     */
-    void report(
-            const Update<Position>& update,
-            const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-            const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells) override;
-
-
-
-    /** @brief Encodes a collection of wifis into the Mozilla loation service JSON dialect. */
-    static void convert_wifis_to_json(
-            const std::vector<com::ubuntu::location::connectivity::WirelessNetwork::Ptr>& wifis,
-            json::Object& destination);
-
-    /** @brief Encodes a collection of radio cells into the Mozilla loation service JSON dialect. */
-    static void convert_cells_to_json(
-            const std::vector<com::ubuntu::location::connectivity::RadioCell::Ptr>& cells,
-            json::Object& destination);
-
-    /** @brief The http request configuration for submissions to the mozilla location service. */
-    core::net::http::Request::Configuration submit_request_config;
-    /** @brief The http client instance used to talk to Mozilla location service instances. */
-    std::shared_ptr<core::net::http::Client> http_client;
-    /** @brief Worker thread for dispatching the http client instance. */
-    std::thread http_client_worker;
-};
-}
-}}
-
-#endif // LOCATION_SERVICE_ICHNAEA_REPORTER_H_

=== removed file 'src/location/service/implementation.cpp'
--- src/location/service/implementation.cpp	2016-06-26 21:17:03 +0000
+++ src/location/service/implementation.cpp	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include <location/service/implementation.h>
-
-#include <location/connectivity/manager.h>
-#include <location/service/harvester.h>
-
-#include <location/service/session/implementation.h>
-
-#include <location/criteria.h>
-#include <location/engine.h>
-#include <location/logging.h>
-#include <location/proxy_provider.h>
-
-#include <core/dbus/bus.h>
-#include <core/dbus/service.h>
-#include <core/dbus/traits/service.h>
-#include <core/dbus/types/object_path.h>
-
-#include <chrono>
-#include <functional>
-#include <sstream>
-
-namespace dbus = core::dbus;
-
-location::service::Implementation::Implementation(const location::service::Implementation::Configuration& config)
-    : Skeleton
-      {
-          Skeleton::Configuration
-          {
-              config.incoming,
-              config.outgoing,
-              location::service::Skeleton::CredentialsResolver::Ptr
-              {
-                  new location::service::Skeleton::DBusDaemonCredentialsResolver
-                  {
-                      config.outgoing
-                  }
-              },
-              location::service::Skeleton::ObjectPathGenerator::Ptr
-              {
-                  new location::service::Skeleton::ObjectPathGenerator{}
-              },
-              config.permission_manager
-          }
-      },
-      configuration(config),
-      harvester(config.harvester),
-      connections
-      {
-          is_online().changed().connect(
-              [this](bool value)
-              {
-                  configuration.engine->configuration.engine_state
-                        = value ?
-                            Engine::Status::on :
-                            Engine::Status::off;
-              }),
-          does_report_cell_and_wifi_ids().changed().connect(
-              [this](bool value)
-              {
-                  configuration.engine->configuration.wifi_and_cell_id_reporting_state
-                      = value ?
-                          location::WifiAndCellIdReportingState::on :
-                          location::WifiAndCellIdReportingState::off;
-
-                  if (value)
-                      harvester.start();
-                  else
-                      harvester.stop();
-              }),
-          does_satellite_based_positioning().changed().connect(
-              [this](bool value)
-              {
-                  configuration.engine->configuration.satellite_based_positioning_state
-                          = value ?
-                              location::SatelliteBasedPositioningState::on :
-                              location::SatelliteBasedPositioningState::off;
-              }),
-          configuration.engine->configuration.engine_state.changed().connect(
-              [this](Engine::Status status)
-              {
-                  switch (status)
-                  {
-                      case Engine::Status::off:
-                          is_online() = false;
-                          mutable_state() = State::disabled;
-                          break;
-                      case Engine::Status::on:
-                          is_online() = true;
-                          mutable_state() = State::enabled;
-                          break;
-                      case Engine::Status::active:
-                          is_online() = true;
-                          mutable_state() = State::active;
-                          break;
-                  }
-              }),
-          configuration.engine->configuration.satellite_based_positioning_state.changed().connect(
-              [this](location::SatelliteBasedPositioningState state)
-              {
-                  does_satellite_based_positioning() =
-                          state == location::SatelliteBasedPositioningState::on;
-              }),
-          configuration.engine->updates.visible_space_vehicles.changed().connect(
-              [this](const std::map<location::SpaceVehicle::Key, location::SpaceVehicle>&svs)
-              {
-                  visible_space_vehicles() = svs;
-              }),
-          configuration.engine->updates.last_known_location.changed().connect(
-              [this](const location::Optional<location::Update<location::Position>>& update)
-              {
-                  if (update)
-                  {
-                      harvester.report_position_update(update.get());
-                  }
-              })
-      }
-{
-    if (!configuration.incoming)
-        throw std::runtime_error("Cannot create service for null bus.");
-    if (!configuration.outgoing)
-        throw std::runtime_error("Cannot create service for null bus.");
-    if (!configuration.engine)
-        throw std::runtime_error("Cannot create service for null engine.");
-    if (!configuration.permission_manager)
-        throw std::runtime_error("Cannot create service for null permission manager.");
-
-    switch (configuration.engine->configuration.engine_state)
-    {
-        case Engine::Status::off:
-            is_online() = false;
-            mutable_state() = State::disabled;
-            break;
-        case Engine::Status::on:
-            is_online() = true;
-            mutable_state() = State::enabled;
-            break;
-          case Engine::Status::active:
-            is_online() = true;
-            mutable_state() = State::active;
-            break;
-    };
-
-    does_report_cell_and_wifi_ids() =
-            configuration.engine->configuration.wifi_and_cell_id_reporting_state ==
-            location::WifiAndCellIdReportingState::on;
-    does_satellite_based_positioning() =
-            configuration.engine->configuration.satellite_based_positioning_state ==
-            location::SatelliteBasedPositioningState::on;
-}
-
-location::service::session::Interface::Ptr location::service::Implementation::create_session_for_criteria(const location::Criteria& criteria)
-{
-    auto provider_selection
-            = configuration.engine->determine_provider_selection_for_criteria(criteria);
-    auto proxy_provider = ProxyProvider::Ptr
-    {
-        new ProxyProvider{provider_selection}
-    };
-
-    session::Interface::Ptr session_iface{new session::Implementation(proxy_provider)};
-    std::weak_ptr<session::Interface> session_weak{session_iface};
-    session_iface->updates().position_status.changed().connect([this, session_weak](const session::Interface::Updates::Status& status)
-    {
-        location::Optional<location::Update<location::Position>> last_known_position = configuration.engine->updates.last_known_location.get();
-        bool has_last_known_position = last_known_position ? true : false;
-        bool is_session_enabled = status == location::service::session::Interface::Updates::Status::enabled;
-        bool is_session_on_or_active = configuration.engine->configuration.engine_state != Engine::Status::off;
-
-        if (has_last_known_position && is_session_enabled && is_session_on_or_active)
-        {
-            // Immediately send the last known position to the client
-            if (auto session_iface = session_weak.lock())
-            {
-                session_iface->updates().position = last_known_position.get();
-            }
-        }
-    });
-    return session_iface;
-}

=== removed file 'src/location/service/implementation.h'
--- src/location/service/implementation.h	2016-06-26 21:17:03 +0000
+++ src/location/service/implementation.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_IMPLEMENTATION_H_
-#define LOCATION_SERVICE_IMPLEMENTATION_H_
-
-#include <location/engine.h>
-#include <location/connectivity/manager.h>
-#include <location/service/harvester.h>
-#include <location/service/skeleton.h>
-
-#include <memory>
-
-namespace dbus = core::dbus;
-
-namespace location
-{
-namespace service
-{
-class Implementation : public Skeleton
-{
-public:
-    typedef std::shared_ptr<Implementation> Ptr;
-
-    // Summarizes configuration options for the implementation.
-    struct Configuration
-    {
-        // The bus connection to expose the service upon.
-        core::dbus::Bus::Ptr incoming;
-        // The bus connection for querying other services.
-        core::dbus::Bus::Ptr outgoing;
-        // The positioning Engine that the service should use.
-        Engine::Ptr engine;
-        // The permission manager that the service should use.
-        PermissionManager::Ptr permission_manager;
-        // All harvesting specific options.
-        Harvester::Configuration harvester;
-    };
-
-    // Creates a new instance of the service with the given configuration.
-    // Throws std::runtime_error in case of issues.
-    Implementation(const Configuration& configuration);
-
-    // Creates a new session for the given criteria.
-    session::Interface::Ptr create_session_for_criteria(const Criteria& criteria);
-
-  private:
-    // The service configuration.
-    Configuration configuration;
-    // The harvester instance.
-    Harvester harvester;
-    // All event connections are automatically cut on destruction.
-    struct
-    {
-        core::ScopedConnection is_online;
-        core::ScopedConnection does_report_cell_and_wifi_ids;
-        core::ScopedConnection does_satellite_based_positioning;
-        core::ScopedConnection engine_state;
-        core::ScopedConnection satellite_based_positioning_state;
-        core::ScopedConnection visible_space_vehicles;
-        core::ScopedConnection reference_position;
-    } connections;
-};
-}
-}
-
-#endif // LOCATION_SERVICE_IMPLEMENTATION_H_

=== removed file 'src/location/service/interface.h'
--- src/location/service/interface.h	2016-06-28 11:53:34 +0000
+++ src/location/service/interface.h	1970-01-01 00:00:00 +0000
@@ -1,261 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_INTERFACE_H_
-#define LOCATION_SERVICE_INTERFACE_H_
-
-#include <location/service/state.h>
-#include <location/service/session/interface.h>
-
-#include <location/space_vehicle.h>
-
-#include <core/dbus/service.h>
-#include <core/dbus/traits/service.h>
-#include <core/dbus/types/object_path.h>
-
-#include <chrono>
-#include <functional>
-
-namespace dbus = core::dbus;
-
-namespace location
-{
-struct Criteria;
-namespace service
-{
-/**
- * @brief The Interface class models the primary interface to the location service.
- */
-class Interface
-{
-  protected:
-    struct Errors
-    {
-        struct InsufficientPermissions
-        {
-            inline static std::string name()
-            {
-                return "com.ubuntu.location.Service.Error.InsufficientPermissions";
-            }
-        };
-        struct CreatingSession
-        {
-            inline static std::string name()
-            {
-                return "com.ubuntu.location.Service.Error.CreatingSession";
-            }
-        };
-    };
-
-    struct CreateSessionForCriteria
-    {
-        typedef location::service::Interface Interface;
-
-        inline static const std::string& name()
-        {
-            static const std::string s
-            {
-                "CreateSessionForCriteria"
-            };
-            return s;
-        }
-
-        typedef dbus::types::ObjectPath ResultType;
-
-        inline static const std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{25};
-        }
-    };
-
-    struct Properties
-    {
-        struct State
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s
-                {
-                    "State"
-                };
-                return s;
-            }
-
-            typedef location::service::Interface Interface;
-            typedef location::service::State ValueType;
-            static const bool readable = true;
-            static const bool writable = true;
-        };
-
-        struct DoesSatelliteBasedPositioning
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s
-                {
-                    "DoesSatelliteBasedPositioning"
-                };
-                return s;
-            }
-
-            typedef location::service::Interface Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = true;
-        };
-
-        struct DoesReportCellAndWifiIds
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s
-                {
-                    "DoesReportCellAndWifiIds"
-                };
-                return s;
-            }
-
-            typedef location::service::Interface Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = true;
-        };
-
-        struct IsOnline
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s
-                {
-                    "IsOnline"
-                };
-                return s;
-            }
-
-            typedef location::service::Interface Interface;
-            typedef bool ValueType;
-            static const bool readable = true;
-            static const bool writable = true;
-        };
-
-        struct VisibleSpaceVehicles
-        {
-            inline static const std::string& name()
-            {
-                static const std::string s
-                {
-                    "VisibleSpaceVehicles"
-                };
-                return s;
-            }
-
-            typedef location::service::Interface Interface;
-            typedef std::map<location::SpaceVehicle::Key, location::SpaceVehicle> ValueType;
-
-            static const bool readable = true;
-            static const bool writable = false;
-        };
-    };
-
-    Interface() = default;
-
-  public:
-    typedef std::shared_ptr<Interface> Ptr;
-
-    /**
-     * @brief Queries the path that this object is known under.
-     */
-    inline static const std::string& path()
-    {
-        static const std::string s{"/location/Service"};
-        return s;
-    }
-
-    Interface(const Interface&) = delete;
-    Interface& operator=(const Interface&) = delete;
-    virtual ~Interface() = default;
-
-    /**
-      * @brief The overall state of the service.
-      * @return a getable/observable property.
-      */
-    virtual const core::Property<State>& state() const = 0;
-
-    /**
-     * @brief Whether the service uses satellite-based positioning.
-     * @return  A setable/getable/observable property.
-     */
-    virtual core::Property<bool>& does_satellite_based_positioning() = 0;
-
-    /**
-     * @brief Whether the overall service and its positioning engine is online or not.
-     * @return  A setable/getable/observable property.
-     */
-    virtual core::Property<bool>& is_online() = 0;
-
-    /**
-     * @brief Whether the engine and its providers/reporters do call home to
-     * report reference locations together with wifi and cell ids.
-     *
-     * We consider this feature privacy sensitive and it defaults to false. The
-     * user has to explicitly opt-in into this feature.
-     *
-     * @return A setable/getable/observable property.
-     */
-    virtual core::Property<bool>& does_report_cell_and_wifi_ids() = 0;
-
-    /**
-      * @brief All space vehicles currently visible.
-      */
-    virtual core::Property<std::map<SpaceVehicle::Key, SpaceVehicle>>& visible_space_vehicles() = 0;
-
-    /**
-     * @brief Starts a new session for the given criteria
-     * @throw std::runtime_error in case of errors.
-     * @param criteria The client's requirements in terms of accuraccy and functionality
-     * @return A session instance.
-     */
-    virtual session::Interface::Ptr create_session_for_criteria(const Criteria& criteria) = 0;
-};
-}
-}
-
-namespace core
-{
-namespace dbus
-{
-namespace traits
-{
-template<>
-struct Service<location::service::Interface>
-{
-    static const std::string& interface_name()
-    {
-        static const std::string s
-        {
-            "com.ubuntu.location.Service"
-        };
-        return s;
-    }
-};
-}
-}
-}
-
-#include <location/dbus/codec.h>
-
-#endif // LOCATION_SERVICE_INTERFACE_H_

=== removed file 'src/location/service/permission_manager.h'
--- src/location/service/permission_manager.h	2016-06-28 11:53:34 +0000
+++ src/location/service/permission_manager.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_PERMISSION_MANAGER_H_
-#define LOCATION_SERVICE_PERMISSION_MANAGER_H_
-
-#include <memory>
-
-namespace location
-{
-struct Criteria;
-namespace service
-{
-/** @brief Credentials of a remote session. */
-struct Credentials
-{
-    /** @brief The process id of the remote peer. */
-    pid_t pid;
-    /** @brief The user id the remote peer runs under. */
-    uid_t uid;
-};
-
-/**
- * @brief The PermissionManager class is an interface to check whether an application
- * is allowed to access the location services.
- */
-class PermissionManager
-{
-public:
-    /** Manager pointer type. */
-    typedef std::shared_ptr<PermissionManager> Ptr;
-
-    /**
-     * @brief The Result enum summarizes the results of a query for permissions.
-     */
-    enum class Result
-    {
-        granted, ///< The app is allowed to access the location service.
-        rejected ///< The app is not allowed to access the location service.
-    };
-
-    virtual ~PermissionManager() = default;
-    PermissionManager(const PermissionManager&) = delete;
-    PermissionManager& operator=(const PermissionManager&) = delete;
-
-    /**
-     * @brief Checks whether the app with the given credentials is allowed to access the service for the given criteria.
-     * @param criteria The requirements of the remote peer.
-     * @param credentials The credentials identifying the remote peer.
-     * @return Result::granted if the remote peer is allowed to access the location service, Result::rejected otherwise.
-     */
-    virtual Result check_permission_for_credentials(
-        const Criteria& criteria,
-        const Credentials& credentials) = 0;
-    
-protected:
-    PermissionManager() = default;
-};
-}
-}
-
-#endif // LOCATION_SERVICE_PERMISSION_MANAGER_H_

=== removed file 'src/location/service/program_options.h'
--- src/location/service/program_options.h	2016-06-26 21:17:03 +0000
+++ src/location/service/program_options.h	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-/*
- * Copyright © 2012-2013 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: Thomas Voß <[e-mail]>
- */
-#include <boost/program_options/parsers.hpp>
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/variables_map.hpp>
-
-#include <core/dbus/well_known_bus.h>
-
-#include <functional>
-#include <iostream>
-
-namespace location
-{
-struct ProgramOptions
-{
-    struct Errors
-    {
-        struct OptionNotSet {};
-    };
-
-    struct Options
-    {
-        static const char* bus() { return "bus"; }
-    };
-
-    ProgramOptions(bool do_allow_unregistered = true) : allow_unregistered(do_allow_unregistered)
-    {
-        add(Options::bus(),
-            "The well-known bus to connect to the service upon",
-            std::string{"session"});
-    }
-
-    ProgramOptions& add(const char* name, const char* desc)
-    {
-        od.add_options()
-                (name, desc);
-        return *this;
-    }
-
-    template<typename T>
-    ProgramOptions& add(const char* name, const char* desc)
-    {
-        od.add_options()
-                (name, boost::program_options::value<T>(), desc);
-        return *this;
-    }
-    
-    template<typename T>
-    ProgramOptions& add(const char* name, const char* desc, const T& default_value)
-    {
-        od.add_options()
-                (name, boost::program_options::value<T>()->default_value(default_value), desc);
-        return *this;
-    }
-
-    template<typename T>
-    ProgramOptions& add_composed(const char* name, const char* desc)
-    {
-        od.add_options()(
-            name, 
-            boost::program_options::value<T>()->composing(),
-            desc);
-        return *this;
-    }
-
-    bool parse_from_command_line_args(int argc, char const** argv)
-    {
-        try
-        {
-            auto parser = boost::program_options::command_line_parser(
-                argc, 
-                argv).options(od);
-            auto parsed = allow_unregistered ? parser.allow_unregistered().run() : parser.run();
-            unrecognized = boost::program_options::collect_unrecognized(
-                parsed.options, 
-                boost::program_options::exclude_positional);
-            boost::program_options::store(parsed, vm);
-        } catch(const std::runtime_error& e)
-        {
-            std::cerr << e.what() << std::endl;
-            return false;
-        }
-
-        return true;
-    }
-
-    bool parse_from_environment()
-    {
-        try
-        {
-            auto parsed = boost::program_options::parse_environment(od, env_prefix);
-            boost::program_options::store(parsed, vm);
-            vm.notify();
-        } catch(const std::runtime_error& e)
-        {
-            std::cerr << e.what() << std::endl;
-            return false;
-        }
-
-        return true;
-    }
-
-    ProgramOptions& environment_prefix(const std::string& prefix)
-    {
-        env_prefix = prefix;
-        return *this;
-    }
-
-    core::dbus::WellKnownBus bus()
-    {
-        static const std::map<std::string, core::dbus::WellKnownBus> lut =
-        {
-            {"session", core::dbus::WellKnownBus::session},
-            {"system", core::dbus::WellKnownBus::system},
-        };
-
-        return lut.at(value_for_key<std::string>(Options::bus()));
-    }
-
-    template<typename T>
-    T value_for_key(const std::string& key)
-    {
-        return vm[key].as<T>();
-    }
-
-    template<typename T>
-    T value_for_key(const std::string& key) const
-    {
-        return vm[key].as<T>();
-    }
-
-    std::size_t value_count_for_key(const std::string& key)
-    {
-        return vm.count(key);
-    }
-
-    void enumerate_unrecognized_options(const std::function<void(const std::string&)>& enumerator)
-    {
-        for (const std::string& s : unrecognized)
-            enumerator(s);
-    }
-
-    void clear()
-    {
-        vm.clear();
-    }
-
-    void print(std::ostream& out) const
-    {
-        for (const auto& pair : vm)
-            out << pair.first << ": " << (pair.second.defaulted() ? "default" : "set") << std::endl;
-    }
-
-    void print_help(std::ostream& out)
-    {
-        out << od;
-    }
-
-    bool allow_unregistered;
-    std::string env_prefix;
-    boost::program_options::options_description od;