Merge lp:~mandel/ubuntu-download-manager/reorg-project into lp:ubuntu-download-manager

[Manuel de la Peña]

Reorg the code so that it is simpler to share code between the uploader and the downloader. Cmake has been added as the new build system.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/271/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/271

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/382/rebuild

review: Needs Fixing (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/612/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/501

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/612/rebuild

review: Approve (continuous-integration)

=== added directory 'ubuntu-download-manager-priv/ubuntu'
=== modified file 'ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro'
--- ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2014-03-05 09:11:46 +0000
+++ ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2014-03-31 13:44:39 +0000
@@ -11,83 +11,72 @@
 DEFINES += APPDOWNLOADERLIB_LIBRARY
 
 SOURCES += \
-    downloads/daemon.cpp \
-    downloads/download.cpp \
-    downloads/download_adaptor.cpp \
-    downloads/downloads_db.cpp \
-    downloads/factory.cpp \
-    downloads/manager.cpp \
-    downloads/download_manager_adaptor.cpp \
-    downloads/queue.cpp \
-    downloads/group_download.cpp \
-    downloads/group_download_adaptor.cpp \
-    downloads/file_download.cpp \
-    downloads/sm_file_download.cpp \
-    downloads/state_machines/download_sm.cpp \
-    system/uuid_utils.cpp \
-    system/uuid_factory.cpp \
-    system/timer.cpp \
-    system/system_network_info.cpp \
-    system/request_factory.cpp \
-    system/process_factory.cpp \
-    system/process.cpp \
-    system/logger.cpp \
-    system/file_manager.cpp \
-    system/application.cpp \
-    system/apparmor.cpp \
-    system/network_reply.cpp \
-    system/dbus_proxy.cpp \
-    downloads/state_machines/state.cpp \
-    downloads/state_machines/final_state.cpp \
-    system/apn_request_factory.cpp \
-    downloads/mms_file_download.cpp \
-    system/apn_proxy.cpp \
-    system/filename_mutex.cpp
+    ubuntu/udm/daemon.cpp \
+    ubuntu/downloads/download.cpp \
+    ubuntu/downloads/download_adaptor.cpp \
+    ubuntu/downloads/downloads_db.cpp \
+    ubuntu/downloads/factory.cpp \
+    ubuntu/downloads/manager.cpp \
+    ubuntu/downloads/download_manager_adaptor.cpp \
+    ubuntu/downloads/queue.cpp \
+    ubuntu/downloads/group_download.cpp \
+    ubuntu/downloads/group_download_adaptor.cpp \
+    ubuntu/downloads/file_download.cpp \
+    ubuntu/downloads/sm_file_download.cpp \
+    ubuntu/downloads/state_machines/download_sm.cpp \
+    ubuntu/downloads/state_machines/state.cpp \
+    ubuntu/downloads/state_machines/final_state.cpp \
+    ubuntu/downloads/mms_file_download.cpp \
+    ubuntu/system/uuid_utils.cpp \
+    ubuntu/system/uuid_factory.cpp \
+    ubuntu/system/timer.cpp \
+    ubuntu/system/system_network_info.cpp \
+    ubuntu/system/request_factory.cpp \
+    ubuntu/system/process_factory.cpp \
+    ubuntu/system/process.cpp \
+    ubuntu/system/logger.cpp \
+    ubuntu/system/file_manager.cpp \
+    ubuntu/system/application.cpp \
+    ubuntu/system/apparmor.cpp \
+    ubuntu/system/network_reply.cpp \
+    ubuntu/system/dbus_proxy.cpp \
+    ubuntu/system/apn_request_factory.cpp \
+    ubuntu/system/apn_proxy.cpp \
+    ubuntu/system/filename_mutex.cpp
 
 HEADERS +=\
-    downloads/daemon.h \
-    downloads/download.h \
-    downloads/download_adaptor.h \
-    downloads/downloads_db.h \
-    downloads/factory.h \
-    downloads/manager.h \
-    downloads/download_manager_adaptor.h \
-    downloads/queue.h \
-    downloads/group_download.h \
-    downloads/group_download_adaptor.h \
-    downloads/file_download.h \
-    downloads/sm_file_download.h \
-    downloads/state_machines/download_sm.h \
-    system/uuid_utils.h \
-    system/uuid_factory.h \
-    system/timer.h \
-    system/system_network_info.h \
-    system/request_factory.h \
-    system/process_factory.h \
-    system/process.h \
-    system/logger.h \
-    system/file_manager.h \
-    system/application.h \
-    system/apparmor.h \
-    system/network_reply.h \
-    system/dbus_proxy.h \
-    downloads/state_machines/state.h \
-    downloads/state_machines/final_state.h \
-    system/apn_request_factory.h \
-    downloads/mms_file_download.h \
-    system/apn_proxy.h \
-    system/filename_mutex.h
-
-OTHER_FILES += \
-    generate_adaptors.sh \
-    com.canonical.applications.download.xml \
-    com.canonical.applications.download_manager.xml \
-    com.canonical.applications.group_download.xml \
-    org.freedesktop.DBus.xml \
-    downloads/com.canonical.applications.group_download.xml \
-    downloads/com.canonical.applications.download_manager.xml \
-    downloads/com.canonical.applications.download.xml \
-    downloads/generate_adaptors.sh
+    ubuntu/udm/daemon.h \
+    ubuntu/downloads/download.h \
+    ubuntu/downloads/download_adaptor.h \
+    ubuntu/downloads/downloads_db.h \
+    ubuntu/downloads/factory.h \
+    ubuntu/downloads/manager.h \
+    ubuntu/downloads/download_manager_adaptor.h \
+    ubuntu/downloads/queue.h \
+    ubuntu/downloads/group_download.h \
+    ubuntu/downloads/group_download_adaptor.h \
+    ubuntu/downloads/file_download.h \
+    ubuntu/downloads/sm_file_download.h \
+    ubuntu/downloads/state_machines/download_sm.h \
+    ubuntu/downloads/state_machines/state.h \
+    ubuntu/downloads/state_machines/final_state.h \
+    ubuntu/downloads/mms_file_download.h \
+    ubuntu/system/uuid_utils.h \
+    ubuntu/system/uuid_factory.h \
+    ubuntu/system/timer.h \
+    ubuntu/system/system_network_info.h \
+    ubuntu/system/request_factory.h \
+    ubuntu/system/process_factory.h \
+    ubuntu/system/process.h \
+    ubuntu/system/logger.h \
+    ubuntu/system/file_manager.h \
+    ubuntu/system/application.h \
+    ubuntu/system/apparmor.h \
+    ubuntu/system/network_reply.h \
+    ubuntu/system/dbus_proxy.h \
+    ubuntu/system/apn_request_factory.h \
+    ubuntu/system/apn_proxy.h \
+    ubuntu/system/filename_mutex.h
 
 include(../common-installs-config.pri)
 

=== renamed directory 'ubuntu-download-manager-priv/downloads' => 'ubuntu-download-manager-priv/ubuntu/downloads'
=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/download.cpp'
--- ubuntu-download-manager-priv/downloads/download.cpp	2014-02-13 17:07:12 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/download.cpp	2014-03-31 13:44:39 +0000
@@ -17,8 +17,8 @@
  */
 
 #include <QStringList>
-#include "system/logger.h"
-#include "downloads/download.h"
+#include "ubuntu/system/logger.h"
+#include "download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/download.h'
--- ubuntu-download-manager-priv/downloads/download.h	2014-02-10 21:26:57 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/download.h	2014-03-31 13:44:39 +0000
@@ -23,9 +23,9 @@
 #include <QObject>
 #include <QProcess>
 #include <QSharedPointer>
-#include "system/process_factory.h"
-#include "system/request_factory.h"
-#include "system/system_network_info.h"
+#include "ubuntu/system/process_factory.h"
+#include "ubuntu/system/request_factory.h"
+#include "ubuntu/system/system_network_info.h"
 
 
 namespace Ubuntu {

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/download_adaptor.cpp'
--- ubuntu-download-manager-priv/downloads/download_adaptor.cpp	2014-01-27 16:36:44 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/download_adaptor.cpp	2014-03-31 13:44:39 +0000
@@ -8,7 +8,7 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#include "downloads/download_adaptor.h"
+#include "download_adaptor.h"
 #include <QtCore/QMetaObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/downloads_db.cpp'
--- ubuntu-download-manager-priv/downloads/downloads_db.cpp	2014-02-10 09:51:58 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/downloads_db.cpp	2014-03-31 13:44:39 +0000
@@ -26,8 +26,8 @@
 #include <QSqlError>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <unistd.h>
-#include "downloads/downloads_db.h"
-#include "system/logger.h"
+#include "ubuntu/system/logger.h"
+#include "downloads_db.h"
 
 namespace {
     const QString SINGLE_DOWNLOAD_TABLE = "CREATE TABLE IF NOT EXISTS SingleDownload("\

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/downloads_db.h'
--- ubuntu-download-manager-priv/downloads/downloads_db.h	2014-02-10 09:51:58 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/downloads_db.h	2014-03-31 13:44:39 +0000
@@ -21,8 +21,8 @@
 
 #include <QSqlDatabase>
 #include <QObject>
-#include "downloads/file_download.h"
-#include "system/file_manager.h"
+#include "ubuntu/system/file_manager.h"
+#include "file_download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/factory.cpp'
--- ubuntu-download-manager-priv/downloads/factory.cpp	2014-03-18 12:07:06 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/factory.cpp	2014-03-31 13:44:39 +0000
@@ -19,13 +19,14 @@
 #include <QNetworkProxy>
 #include <QPair>
 #include <ubuntu/download_manager/metadata.h>
-#include "downloads/download_adaptor.h"
-#include "downloads/group_download.h"
-#include "downloads/group_download_adaptor.h"
-#include "downloads/file_download.h"
-#include "downloads/mms_file_download.h"
-#include "downloads/factory.h"
-#include "system/logger.h"
+#include "ubuntu/system/logger.h"
+#include "download_adaptor.h"
+#include "group_download.h"
+#include "group_download_adaptor.h"
+#include "file_download.h"
+#include "mms_file_download.h"
+#include "factory.h"
+
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/factory.h'
--- ubuntu-download-manager-priv/downloads/factory.h	2014-03-18 12:07:06 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/factory.h	2014-03-31 13:44:39 +0000
@@ -21,10 +21,10 @@
 
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
-#include "downloads/download.h"
-#include "system/apparmor.h"
-#include "system/system_network_info.h"
-#include "system/uuid_factory.h"
+#include "ubuntu/system/apparmor.h"
+#include "ubuntu/system/system_network_info.h"
+#include "ubuntu/system/uuid_factory.h"
+#include "download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/file_download.cpp'
--- ubuntu-download-manager-priv/downloads/file_download.cpp	2014-03-17 17:24:45 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/file_download.cpp	2014-03-31 13:44:39 +0000
@@ -25,10 +25,10 @@
 #include <QSslError>
 #include <ubuntu/download_manager/metadata.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
-#include "downloads/file_download.h"
-#include "system/filename_mutex.h"
-#include "system/logger.h"
-#include "system/network_reply.h"
+#include "ubuntu/system/logger.h"
+#include "ubuntu/system/network_reply.h"
+#include "ubuntu/system/filename_mutex.h"
+#include "file_download.h"
 
 #define DOWN_LOG(LEVEL) LOG(LEVEL) << ((parent() != nullptr)?"GroupDownload {" + parent()->objectName() + " } ":"") << "Download ID{" << objectName() << " } "
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/file_download.h'
--- ubuntu-download-manager-priv/downloads/file_download.h	2014-03-03 17:07:20 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/file_download.h	2014-03-31 13:44:39 +0000
@@ -28,9 +28,9 @@
 #include <ubuntu/download_manager/http_error_struct.h>
 #include <ubuntu/download_manager/network_error_struct.h>
 #include <ubuntu/download_manager/process_error_struct.h>
-#include "downloads/download.h"
-#include "system/file_manager.h"
-#include "system/filename_mutex.h"
+#include "ubuntu/system/filename_mutex.h"
+#include "ubuntu/system/file_manager.h"
+#include "download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/group_download.cpp'
--- ubuntu-download-manager-priv/downloads/group_download.cpp	2014-03-05 09:11:46 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/group_download.cpp	2014-03-31 13:44:39 +0000
@@ -20,11 +20,11 @@
 #include <QFileInfo>
 #include <ubuntu/download_manager/metadata.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
-#include "downloads/download_adaptor.h"
-#include "downloads/file_download.h"
-#include "downloads/group_download.h"
-#include "system/logger.h"
-#include "system/uuid_factory.h"
+#include "ubuntu/system/logger.h"
+#include "ubuntu/system/uuid_factory.h"
+#include "download_adaptor.h"
+#include "file_download.h"
+#include "group_download.h"
 
 #define GROUP_LOG(LEVEL) LOG(LEVEL) << "Group Download {" << objectName() << " } "
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/group_download.h'
--- ubuntu-download-manager-priv/downloads/group_download.h	2014-02-20 20:13:28 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/group_download.h	2014-03-31 13:44:39 +0000
@@ -24,10 +24,10 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <ubuntu/download_manager/group_download_struct.h>
-#include "downloads/download.h"
-#include "downloads/factory.h"
-#include "downloads/file_download.h"
-#include "system/file_manager.h"
+#include "ubuntu/system/file_manager.h"
+#include "download.h"
+#include "factory.h"
+#include "file_download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/group_download_adaptor.cpp'
--- ubuntu-download-manager-priv/downloads/group_download_adaptor.cpp	2014-02-11 20:39:21 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/group_download_adaptor.cpp	2014-03-31 13:44:39 +0000
@@ -8,8 +8,6 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#include "downloads/group_download.h"
-#include "downloads/group_download_adaptor.h"
 #include <QtCore/QMetaObject>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
@@ -17,6 +15,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
+#include "group_download.h"
+#include "group_download_adaptor.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/manager.cpp'
--- ubuntu-download-manager-priv/downloads/manager.cpp	2014-03-18 12:07:06 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/manager.cpp	2014-03-31 13:44:39 +0000
@@ -18,10 +18,10 @@
 
 #include <functional>
 #include <QRegExp>
-#include "downloads/manager.h"
-#include "system/apparmor.h"
-#include "system/logger.h"
-#include "system/request_factory.h"
+#include "ubuntu/system/apparmor.h"
+#include "ubuntu/system/logger.h"
+#include "ubuntu/system/request_factory.h"
+#include "manager.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/manager.h'
--- ubuntu-download-manager-priv/downloads/manager.h	2014-03-18 12:07:06 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/manager.h	2014-03-31 13:44:39 +0000
@@ -26,11 +26,11 @@
 #include <QSslCertificate>
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/system/dbus_connection.h>
-#include "downloads/download.h"
-#include "downloads/downloads_db.h"
-#include "downloads/queue.h"
-#include "downloads/factory.h"
-#include "system/application.h"
+#include "ubuntu/system/application.h"
+#include "download.h"
+#include "downloads_db.h"
+#include "queue.h"
+#include "factory.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/mms_file_download.cpp'
--- ubuntu-download-manager-priv/downloads/mms_file_download.cpp	2014-03-18 11:22:26 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/mms_file_download.cpp	2014-03-31 13:44:39 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "system/apn_request_factory.h"
+#include "ubuntu/system/apn_request_factory.h"
 #include "mms_file_download.h"
 
 namespace Ubuntu {

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/queue.cpp'
--- ubuntu-download-manager-priv/downloads/queue.cpp	2014-02-03 17:52:16 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/queue.cpp	2014-03-31 13:44:39 +0000
@@ -17,9 +17,9 @@
  */
 
 #include <QSignalMapper>
-#include "downloads/queue.h"
-#include "system/logger.h"
-#include "system/system_network_info.h"
+#include "ubuntu/system/logger.h"
+#include "ubuntu/system/system_network_info.h"
+#include "queue.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/queue.h'
--- ubuntu-download-manager-priv/downloads/queue.h	2014-01-29 10:47:13 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/queue.h	2014-03-31 13:44:39 +0000
@@ -22,8 +22,8 @@
 #include <QList>
 #include <QPair>
 #include <QSharedPointer>
-#include "downloads/download.h"
-#include "downloads/download_adaptor.h"
+#include "download.h"
+#include "download_adaptor.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/state_machines/download_sm.cpp'
--- ubuntu-download-manager-priv/downloads/state_machines/download_sm.cpp	2014-01-28 16:03:24 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/state_machines/download_sm.cpp	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #include <QState>
 #include <QStateMachine>
 #include <QSslError>
-#include "system/logger.h"
+#include "ubuntu/system/logger.h"
 #include "download_sm.h"
 #include "final_state.h"
 #include "state.h"

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/state_machines/download_sm.h'
--- ubuntu-download-manager-priv/downloads/state_machines/download_sm.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/state_machines/download_sm.h	2014-03-31 13:44:39 +0000
@@ -24,7 +24,7 @@
 #include <QState>
 #include <QObject>
 #include <QVariant>
-#include "downloads/sm_file_download.h"
+#include "ubuntu/downloads/sm_file_download.h"
 
 namespace Ubuntu {
 

=== modified file 'ubuntu-download-manager-priv/ubuntu/downloads/state_machines/final_state.cpp'
--- ubuntu-download-manager-priv/downloads/state_machines/final_state.cpp	2014-01-24 11:54:24 +0000
+++ ubuntu-download-manager-priv/ubuntu/downloads/state_machines/final_state.cpp	2014-03-31 13:44:39 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "system/logger.h"
+#include "ubuntu/system/logger.h"
 #include "final_state.h"
 
 namespace Ubuntu {

=== renamed directory 'ubuntu-download-manager-priv/system' => 'ubuntu-download-manager-priv/ubuntu/system'
=== added directory 'ubuntu-download-manager-priv/ubuntu/udm'
=== renamed file 'ubuntu-download-manager-priv/downloads/daemon.cpp' => 'ubuntu-download-manager-priv/ubuntu/udm/daemon.cpp'
--- ubuntu-download-manager-priv/downloads/daemon.cpp	2014-02-21 11:52:42 +0000
+++ ubuntu-download-manager-priv/ubuntu/udm/daemon.cpp	2014-03-31 13:44:39 +0000
@@ -19,12 +19,12 @@
 #include <QtDBus/QDBusConnection>
 #include <QSharedPointer>
 #include <QSslCertificate>
-#include "downloads/daemon.h"
-#include "downloads/manager.h"
-#include "downloads/download_manager_adaptor.h"
-#include "system/application.h"
-#include "system/logger.h"
-#include "system/timer.h"
+#include "ubuntu/downloads/manager.h"
+#include "ubuntu/downloads/download_manager_adaptor.h"
+#include "ubuntu/system/application.h"
+#include "ubuntu/system/logger.h"
+#include "ubuntu/system/timer.h"
+#include "daemon.h"
 
 
 namespace {

=== renamed file 'ubuntu-download-manager-priv/downloads/daemon.h' => 'ubuntu-download-manager-priv/ubuntu/udm/daemon.h'
=== renamed directory 'ubuntu-download-manager-priv/uploads' => 'ubuntu-download-manager-priv/ubuntu/uploads'
=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.cpp'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.cpp	2014-02-11 19:57:39 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.cpp	2014-03-31 13:44:39 +0000
@@ -19,8 +19,8 @@
 #include <QDebug>
 #include <QDBusError>
 #include <ubuntu/download_manager/system/dbus_connection.h>
-#include <system/application.h>
-#include <system/timer.h>
+#include <ubuntu/system/application.h>
+#include <ubuntu/system/timer.h>
 #include "testing_manager.h"
 #include "testing_manager_adaptor.h"
 #include "testing_daemon.h"

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.h	2014-02-11 19:57:39 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_daemon.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
-#include <downloads/daemon.h>  // comes from the priv lib, just for testing!!!!
+#include <ubuntu/udm/daemon.h>  // comes from the priv lib, just for testing!!!!
 
 class TestingManagerAdaptor;
 class TestingDaemon : public Ubuntu::DownloadManager::Daemon::Daemon {

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_file_download.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_file_download.h	2014-02-11 19:57:39 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_file_download.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QDBusContext>
 #include <QObject>
-#include <downloads/file_download.h>
+#include <ubuntu/downloads/file_download.h>
 #include <ubuntu/download_manager/metatypes.h>
 
 using namespace Ubuntu::DownloadManager::Daemon;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.cpp'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.cpp	2014-02-11 19:57:39 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.cpp	2014-03-31 13:44:39 +0000
@@ -17,10 +17,10 @@
  */
 
 #include <QDebug>
-#include <downloads/queue.h>
-#include <downloads/download.h>
-#include <downloads/download_adaptor.h>
-#include <downloads/file_download.h>
+#include <ubuntu/downloads/queue.h>
+#include <ubuntu/downloads/download.h>
+#include <ubuntu/downloads/download_adaptor.h>
+#include <ubuntu/downloads/file_download.h>
 #include "testing_file_download.h"
 #include "testing_manager.h"
 

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.h	2014-02-11 19:57:39 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/client/testing_manager.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <ubuntu/download_manager/metatypes.h>
-#include <downloads/manager.h>  // comes from the priv lib, just for testing!!!!
+#include <ubuntu/downloads/manager.h>  // comes from the priv lib, just for testing!!!!
 
 using namespace Ubuntu::DownloadManager::Daemon;
 

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h	2014-01-28 18:51:12 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_APN_REQUEST_FACTORY_H
 
 #include <QObject>
-#include <system/apn_request_factory.h>
+#include <ubuntu/system/apn_request_factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace  Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.cpp'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.cpp	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.cpp	2014-03-31 13:44:39 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <system/uuid_utils.h>
+#include <ubuntu/system/uuid_utils.h>
 #include "apparmor.h"
 
 FakeAppArmor::FakeAppArmor(QSharedPointer<UuidFactory> uuidFactory,

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apparmor.h	2014-03-31 13:44:39 +0000
@@ -21,8 +21,8 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include <system/apparmor.h>
-#include <system/uuid_factory.h>
+#include <ubuntu/system/apparmor.h>
+#include <ubuntu/system/uuid_factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/application.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_APPLICATION_H
 
 #include <QObject>
-#include <system/application.h>
+#include <ubuntu/system/application.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h	2014-02-13 13:21:14 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h	2014-03-31 13:44:39 +0000
@@ -20,8 +20,8 @@
 #define FAKE_DOWNLOAD_H
 
 #include <QSharedPointer>
-#include <downloads/file_download.h>
-#include <system/system_network_info.h>
+#include <ubuntu/downloads/file_download.h>
+#include <ubuntu/system/system_network_info.h>
 #include <ubuntu/download_manager/metatypes.h>
 #include "ubuntu/download_manager/tests/fake.h"
 

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/factory.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include <downloads/factory.h>
+#include <ubuntu/downloads/factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.h	2014-02-01 09:01:47 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/file_manager.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_FILE_MANAGER_H
 
 #include <QObject>
-#include <system/file_manager.h>
+#include <ubuntu/system/file_manager.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/filename_mutex.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/filename_mutex.h	2014-02-18 16:39:22 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/filename_mutex.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FILENAME_MUTEXT_H
 
 #include <QObject>
-#include <system/filename_mutex.h>
+#include <ubuntu/system/filename_mutex.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/group_download.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/group_download.h	2014-02-13 13:21:14 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/group_download.h	2014-03-31 13:44:39 +0000
@@ -19,7 +19,7 @@
 #ifndef FAKE_GROUP_DOWNLOAD_H
 #define FAKE_GROUP_DOWNLOAD_H
 
-#include <downloads/group_download.h>
+#include <ubuntu/downloads/group_download.h>
 #include "download.h"
 
 class FakeGroupDownload : public GroupDownload {

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/manager.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_DOWNLOAD_MANAGER_H
 
 #include <QObject>
-#include <downloads/manager.h>
+#include <ubuntu/downloads/manager.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.h	2014-02-04 12:13:02 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/network_reply.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QMap>
 #include <QObject>
-#include <system/network_reply.h>
+#include <ubuntu/system/network_reply.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.h	2014-01-29 13:47:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_PROCESS_H
 
 #include <QObject>
-#include <system/process.h>
+#include <ubuntu/system/process.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/process_factory.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_PROCESS_FACTORY_H
 
 #include <QObject>
-#include <system/process_factory.h>
+#include <ubuntu/system/process_factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/queue.h	2014-03-31 13:44:39 +0000
@@ -19,8 +19,8 @@
 #ifndef FAKE_DOWNLOAD_QUEUE_H
 #define FAKE_DOWNLOAD_QUEUE_H
 #include <QSharedPointer>
-#include <downloads/queue.h>
-#include <system/system_network_info.h>
+#include <ubuntu/downloads/queue.h>
+#include <ubuntu/system/system_network_info.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::Daemon;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.h	2014-02-04 12:13:02 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/request_factory.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QPair>
-#include <system/request_factory.h>
+#include <ubuntu/system/request_factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/sm_file_download.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <QSslError>
-#include <downloads/sm_file_download.h>
+#include <ubuntu/downloads/sm_file_download.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::Daemon;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/system_network_info.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_SYSTEM_NETWORK_INFO_H
 
 #include <QObject>
-#include <system/system_network_info.h>
+#include <ubuntu/system/system_network_info.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/timer.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_TIMER_H
 
 #include <QObject>
-#include <system/timer.h>
+#include <ubuntu/system/timer.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/uuid_factory.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define FAKE_UUID_FACTORY_H
 
 #include <QObject>
-#include <system/uuid_factory.h>
+#include <ubuntu/system/uuid_factory.h>
 #include "ubuntu/download_manager/tests/fake.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_cancel_download_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QState>
 #include <QStateMachine>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_file_download_sm.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QState>
 #include <QStateMachine>
 #include <QSignalTransition>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_final_state.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QState>
 #include <QStateMachine>
 #include <QSignalTransition>
-#include <downloads/state_machines/final_state.h>
+#include <ubuntu/downloads/state_machines/final_state.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_network_error_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QState>
 #include <QStateMachine>
 #include <QObject>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_resume_download_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QState>
 #include <QStateMachine>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>
@@ -34,7 +34,7 @@
     Q_OBJECT
  public:
     explicit TestResumeDownloadTransition(QObject *parent = 0);
-    
+
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_ssl_error_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QState>
 #include <QStateMachine>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_start_download_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QState>
 #include <QStateMachine>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>

=== modified file 'ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h'
--- ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/state_machines/test_stop_request_transition.h	2014-03-31 13:44:39 +0000
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QState>
 #include <QStateMachine>
-#include <downloads/state_machines/download_sm.h>
+#include <ubuntu/downloads/state_machines/download_sm.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/sm_file_download.h>
@@ -35,7 +35,7 @@
 
  public:
     explicit TestStopRequestTransition(QObject *parent = 0);
-    
+
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define TEST_DOWNLOAD_DAEMON_H
 
 #include <QObject>
-#include <downloads/daemon.h>
+#include <ubuntu/udm/daemon.h>
 #include <ubuntu/download_manager/tests/server/application.h>
 #include <ubuntu/download_manager/tests/server/dbus_connection.h>
 #include <ubuntu/download_manager/tests/server/manager.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_download.cpp	2014-03-17 17:24:45 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.cpp	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #include <QSignalSpy>
 #include <QSslError>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
-#include <system/uuid_utils.h>
+#include <ubuntu/system/uuid_utils.h>
 #include <ubuntu/download_manager/tests/server/network_reply.h>
 #include <ubuntu/download_manager/tests/server/process.h>
 #include "test_download.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_download.h'
--- ubuntu-download-manager-tests/downloads/test_download.h	2014-03-03 17:07:20 +0000
+++ ubuntu-download-manager-tests/downloads/test_download.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 
 #include <QDir>
 #include <QObject>
-#include <downloads/file_download.h>
+#include <ubuntu/downloads/file_download.h>
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/tests/server/file_manager.h>
 #include <ubuntu/download_manager/tests/server/filename_mutex.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2014-03-18 12:07:06 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2014-03-31 13:44:39 +0000
@@ -16,11 +16,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <downloads/file_download.h>
-#include <downloads/mms_file_download.h>
+#include <ubuntu/downloads/file_download.h>
+#include <ubuntu/downloads/mms_file_download.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
-#include <system/file_manager.h>
-#include <system/uuid_utils.h>
+#include <ubuntu/system/file_manager.h>
+#include <ubuntu/system/uuid_utils.h>
 #include "test_download_factory.h"
 
 TestDownloadFactory::TestDownloadFactory(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.h'
--- ubuntu-download-manager-tests/downloads/test_download_factory.h	2014-01-28 18:51:12 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.h	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #define TEST_DOWNLOAD_FACTORY_H
 
 #include <QObject>
-#include <downloads/factory.h>
+#include <ubuntu/downloads/factory.h>
 #include <ubuntu/download_manager/tests/server/apparmor.h>
 #include <ubuntu/download_manager/tests/server/system_network_info.h>
 #include <ubuntu/download_manager/tests/server/request_factory.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2014-03-31 13:44:39 +0000
@@ -17,9 +17,9 @@
  */
 
 #include <QSignalSpy>
-#include <downloads/factory.h>
+#include <ubuntu/downloads/factory.h>
 #include <ubuntu/download_manager/download_struct.h>
-#include <system/uuid_utils.h>
+#include <ubuntu/system/uuid_utils.h>
 #include <ubuntu/download_manager/tests/server/process_factory.h>
 #include <ubuntu/download_manager/tests/server/system_network_info.h>
 #include "test_download_manager.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.h'
--- ubuntu-download-manager-tests/downloads/test_download_manager.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.h	2014-03-31 13:44:39 +0000
@@ -21,8 +21,8 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include <downloads/manager.h>
-#include <downloads/file_download.h>
+#include <ubuntu/downloads/manager.h>
+#include <ubuntu/downloads/file_download.h>
 #include <ubuntu/download_manager/tests/server/application.h>
 #include <ubuntu/download_manager/tests/server/apparmor.h>
 #include <ubuntu/download_manager/tests/server/dbus_connection.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2014-01-29 10:56:24 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2014-03-31 13:44:39 +0000
@@ -17,7 +17,7 @@
  */
 
 #include <QSignalSpy>
-#include <system/uuid_utils.h>
+#include <ubuntu/system/uuid_utils.h>
 #include "test_download_queue.h"
 
 TestDownloadQueue::TestDownloadQueue(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.h'
--- ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-01-29 10:47:13 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-03-31 13:44:39 +0000
@@ -20,8 +20,8 @@
 #define TEST_DOWNLOAD_QUEUE_H
 
 #include <QObject>
-#include <downloads/download_adaptor.h>
-#include <downloads/queue.h>
+#include <ubuntu/downloads/download_adaptor.h>
+#include <ubuntu/downloads/queue.h>
 #include <ubuntu/download_manager/tests/server/download.h>
 #include <ubuntu/download_manager/tests/server/request_factory.h>
 #include <ubuntu/download_manager/tests/server/process_factory.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2014-02-18 16:39:22 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.cpp	2014-03-31 13:44:39 +0000
@@ -24,7 +24,7 @@
 #include <QSignalSpy>
 #include <ubuntu/download_manager/metatypes.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
-#include <system/uuid_utils.h>
+#include <ubuntu/system/uuid_utils.h>
 #include <ubuntu/download_manager/tests/server/download.h>
 #include <ubuntu/download_manager/tests/server/system_network_info.h>
 #include <ubuntu/download_manager/tests/server/request_factory.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_downloads_db.h'
--- ubuntu-download-manager-tests/downloads/test_downloads_db.h	2014-02-18 16:39:22 +0000
+++ ubuntu-download-manager-tests/downloads/test_downloads_db.h	2014-03-31 13:44:39 +0000
@@ -21,7 +21,7 @@
 #include <QDir>
 #include <QObject>
 #include <QSqlDatabase>
-#include <downloads/downloads_db.h>
+#include <ubuntu/downloads/downloads_db.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 #include <ubuntu/download_manager/tests/server/filename_mutex.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_group_download.cpp	2014-02-19 19:01:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.cpp	2014-03-31 13:44:39 +0000
@@ -18,9 +18,9 @@
 
 #include <QScopedPointer>
 #include <QSignalSpy>
-#include <downloads/group_download.h>
-#include <system/uuid_utils.h>
 #include <ubuntu/download_manager/metadata.h>
+#include <ubuntu/downloads/group_download.h>
+#include <ubuntu/system/uuid_utils.h>
 #include <ubuntu/download_manager/tests/server/download.h>
 #include <ubuntu/download_manager/tests/server/group_download.h>
 #include "test_group_download.h"

=== modified file 'ubuntu-download-manager-tests/downloads/test_group_download.h'
--- ubuntu-download-manager-tests/downloads/test_group_download.h	2014-02-13 13:21:14 +0000
+++ ubuntu-download-manager-tests/downloads/test_group_download.h	2014-03-31 13:44:39 +0000
@@ -20,8 +20,8 @@
 #define TEST_GROUP_DOWNLOAD_H
 
 #include <QObject>
-#include <system/uuid_factory.h>
-#include <downloads/group_download.h>
+#include <ubuntu/system/uuid_factory.h>
+#include <ubuntu/downloads/group_download.h>
 #include <ubuntu/download_manager/tests/server/apparmor.h>
 #include <ubuntu/download_manager/tests/server/file_manager.h>
 #include <ubuntu/download_manager/tests/server/system_network_info.h>

=== modified file 'ubuntu-download-manager-tests/downloads/test_mms_download.h'
--- ubuntu-download-manager-tests/downloads/test_mms_download.h	2014-01-29 12:11:35 +0000
+++ ubuntu-download-manager-tests/downloads/test_mms_download.h	2014-03-31 13:44:39 +0000
@@ -20,9 +20,9 @@
 #define TEST_MMS_DOWNLOAD_H
 
 #include <QObject>
-#include <system/request_factory.h>
-#include <system/apn_request_factory.h>
-#include <downloads/mms_file_download.h>
+#include <ubuntu/system/request_factory.h>
+#include <ubuntu/system/apn_request_factory.h>
+#include <ubuntu/downloads/mms_file_download.h>
 #include <ubuntu/download_manager/tests/base_testcase.h>
 #include <ubuntu/download_manager/tests/test_runner.h>
 

=== modified file 'ubuntu-download-manager-tests/system/test_filename_mutex.cpp'
--- ubuntu-download-manager-tests/system/test_filename_mutex.cpp	2014-02-18 16:39:22 +0000
+++ ubuntu-download-manager-tests/system/test_filename_mutex.cpp	2014-03-31 13:44:39 +0000
@@ -20,7 +20,7 @@
 #include <QDir>
 #include <QFile>
 #include <QScopedPointer>
-#include <system/filename_mutex.h>
+#include <ubuntu/system/filename_mutex.h>
 #include "test_filename_mutex.h"
 
 using namespace Ubuntu::DownloadManager::System;

=== modified file 'ubuntu-download-manager/main.cpp'
--- ubuntu-download-manager/main.cpp	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager/main.cpp	2014-03-31 13:44:39 +0000
@@ -18,7 +18,7 @@
 
 #include <QTimer>
 #include <QCoreApplication>
-#include <downloads/daemon.h>
+#include <ubuntu/udm/daemon.h>
 
 using namespace Ubuntu::DownloadManager::Daemon;