Merge lp:~mandel/ubuntu-download-manager/all-downloads-client into lp:ubuntu-download-manager

[Manuel de la Peña]

Provide the methods that allow to get all the downloads and all the downloads with a given metadata value.

Provide the methods that allow to get all the downloads and all the downloads with a given metadata value.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/360/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/249

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

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

looks good, tests pass. will start adding it to unity-scope-click and I'll file separate bugs if there are any problems.

review: Approve

[Alejandro J. Cura (alecu)]

puked a little bit in my mouth when I saw the size of this, but it looks good: +1

review: Approve

[dobey (dobey)]

Why are so many changes in this one branch? Particularly the huge change to cmake, addition of coverage reporting (the necessary cmake files of which have some small licensing issues), and several other small bug fixes? The branch is now beyond unreasonably huge, due to r242..246 which were all added after the branch had been approved. Not to mention the 19 other current MPs, some of which are also extremely large.

I find it very hard to believe that a branch of this size, with this many changes, is acceptable to land. Are those commits made *after* the approval really necessary to have here? If so, why?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/613/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/503/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/502

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

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/all-downloads-client]

247. By Manuel de la Peña on 2014-04-15

Remove useless files.

248. By Manuel de la Peña on 2014-04-15

Merged set-download-dir into all-downloads-client.

249. By Manuel de la Peña on 2014-04-15

Merged set-download-dir into all-downloads-client.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/615/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/504

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/all-downloads-client]

250. By Manuel de la Peña on 2014-04-21

Remove the .THIS file.

251. By Manuel de la Peña on 2014-04-21

Fix the system dbus activation file location.

252. By Manuel de la Peña on 2014-04-29

Update the name of the package to match the names of the .so

253. By Manuel de la Peña on 2014-04-29

Move the location of the pkconfig files.

254. By Manuel de la Peña on 2014-04-29

Add pkgconfig to the .pc paths.

255. By Manuel de la Peña on 2014-04-29

Do not configure in the wrong dir and jsut move to libexdir on install time.

256. By Manuel de la Peña on 2014-04-29

Fix broken install path.

Unmerged revisions

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,73 @@
+project(ubuntu-download-manager)
+cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -pthread")
+
+
+# Standard install paths
+include(GNUInstallDirs)
+
+include(EnableCoverageReport)
+#####################################################################
+# Enable code coverage calculation with gcov/gcovr/lcov
+# Usage:
+#  * Switch build type to coverage (use ccmake or cmake-gui)
+#  * Invoke make, make test, make coverage
+#  * Find html report in subdir coveragereport
+#  * Find xml report feasible for jenkins in coverage.xml
+#####################################################################
+IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" )
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" )
+  ENABLE_COVERAGE_REPORT(TARGETS ${DIALER_APP})
+ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+
+execute_process(
+    COMMAND qmake -query QT_INSTALL_QML
+    OUTPUT_VARIABLE QT_INSTALL_QML
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(UDM_VERSION_MAJOR 0)
+set(UDM_VERSION_MINOR 3)
+set(UDM_VERSION_PATCH 0)
+
+find_package(Gtest REQUIRED)
+include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
+
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5SystemInfo REQUIRED)
+find_package(Qt5Sql REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(DBUS REQUIRED dbus-1)
+pkg_check_modules(GLOG REQUIRED libglog)
+pkg_check_modules(NIH_DBUS REQUIRED libnih-dbus)
+pkg_check_modules(GLOG REQUIRED libglog)
+pkg_check_modules(GLOG libglog)
+
+enable_testing()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -std=c++11 -Werror -O2 -Wall -W -D_REENTRANT -fPIC -pedantic -Wextra")
+add_definitions("-DNDEBUG")
+
+if(NOT CMAKE_BUILD_TYPE)
+	message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+	set(CMAKE_BUILD_TYPE RelWithDebInfo)
+endif()
+
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
+
+if(cmake_build_type_lower MATCHES relwithdebinfo) # workaround for http://pub    lic.kitware.com/Bug/view.php?id=14696
+	add_definitions(-DQT_NO_DEBUG)
+endif()
+
+add_subdirectory(src)
+add_subdirectory(tests)

=== added directory 'cmake'
=== added directory 'cmake/modules'
=== added file 'cmake/modules/EnableCoverageReport.cmake'
--- cmake/modules/EnableCoverageReport.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/EnableCoverageReport.cmake	2014-04-11 16:06:36 +0000
@@ -0,0 +1,153 @@
+# - Creates a special coverage build type and target on GCC.
+#
+# Defines a function ENABLE_COVERAGE_REPORT which generates the coverage target
+# for selected targets. Optional arguments to this function are used to filter
+# unwanted results using globbing expressions. Moreover targets with tests for
+# the source code can be specified to trigger regenerating the report if the
+# test has changed
+#
+# ENABLE_COVERAGE_REPORT(TARGETS target... [FILTER filter...] [TESTS test targets...])
+#
+# To generate a coverage report first build the project with
+# CMAKE_BUILD_TYPE=coverage, then call make test and afterwards make coverage.
+#
+# The coverage report is based on gcov. Depending on the availability of lcov
+# a HTML report will be generated and/or an XML report of gcovr is found.
+# The generated coverage target executes all found solutions. Special targets
+# exist to create e.g. only the xml report: coverage-xml. 
+#
+# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# 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 General Public License for more details.
+#
+
+INCLUDE(ParseArguments)
+
+FIND_PACKAGE(Lcov)
+FIND_PACKAGE(gcovr)
+
+FUNCTION(ENABLE_COVERAGE_REPORT)
+    
+    # argument parsing
+    PARSE_ARGUMENTS(ARG "FILTER;TARGETS;TESTS" "" ${ARGN})
+    
+    SET(COVERAGE_RAW_FILE "${CMAKE_BINARY_DIR}/coverage.raw.info")
+    SET(COVERAGE_FILTERED_FILE "${CMAKE_BINARY_DIR}/coverage.info")
+    SET(COVERAGE_REPORT_DIR "${CMAKE_BINARY_DIR}/coveragereport")
+    SET(COVERAGE_XML_FILE "${CMAKE_BINARY_DIR}/coverage.xml")
+    SET(COVERAGE_XML_COMMAND_FILE "${CMAKE_BINARY_DIR}/coverage-xml.cmake")
+    
+    # decide if there is any tool to create coverage data
+    SET(TOOL_FOUND FALSE)
+    IF(LCOV_FOUND OR GCOVR_FOUND)
+        SET(TOOL_FOUND TRUE)
+    ENDIF()
+    IF(NOT TOOL_FOUND)
+        MESSAGE(STATUS "Cannot enable coverage targets because neither lcov nor gcovr are found.")
+    ENDIF()
+    
+    STRING(TOLOWER "${CMAKE_BUILD_TYPE}" COVERAGE_BUILD_TYPE)
+    IF(CMAKE_COMPILER_IS_GNUCXX AND TOOL_FOUND AND "${COVERAGE_BUILD_TYPE}" MATCHES "coverage")
+    
+        MESSAGE(STATUS "Coverage support enabled for targets: ${ARG_TARGETS}")
+    
+        # create coverage build type
+        SET(CMAKE_CXX_FLAGS_COVERAGE ${CMAKE_CXX_FLAGS_DEBUG} PARENT_SCOPE)
+        SET(CMAKE_C_FLAGS_COVERAGE ${CMAKE_C_FLAGS_DEBUG} PARENT_SCOPE)
+        SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} coverage PARENT_SCOPE)
+    
+        # instrument targets
+        SET_TARGET_PROPERTIES(${ARG_TARGETS} PROPERTIES COMPILE_FLAGS --coverage
+                                                        LINK_FLAGS --coverage)
+    
+        # html report
+        IF (LCOV_FOUND)
+        
+            MESSAGE(STATUS "Enabling HTML coverage report")
+    
+            # set up coverage target
+            
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_RAW_FILE}
+                               COMMAND ${LCOV_EXECUTABLE} -c -d ${CMAKE_BINARY_DIR} -o ${COVERAGE_RAW_FILE}
+                               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                               COMMENT "Collecting coverage data"
+                               DEPENDS ${ARG_TARGETS} ${ARG_TESTS}
+                               VERBATIM)
+            
+            # filter unwanted stuff
+            LIST(LENGTH ARG_FILTER FILTER_LENGTH)
+            IF(${FILTER_LENGTH} GREATER 0)
+                SET(FILTER COMMAND ${LCOV_EXECUTABLE})
+                FOREACH(F ${ARG_FILTER})
+                    SET(FILTER ${FILTER} -r ${COVERAGE_FILTERED_FILE} ${F})
+                ENDFOREACH()
+                SET(FILTER ${FILTER} -o ${COVERAGE_FILTERED_FILE})
+            ELSE()
+                SET(FILTER "")
+            ENDIF()
+            
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_FILTERED_FILE}
+                               COMMAND ${LCOV_EXECUTABLE} -e ${COVERAGE_RAW_FILE} "${CMAKE_SOURCE_DIR}*"  -o ${COVERAGE_FILTERED_FILE}
+                               ${FILTER}
+                               DEPENDS ${COVERAGE_RAW_FILE}
+                               COMMENT "Filtering recorded coverage data for project-relevant entries"
+                               VERBATIM)
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_REPORT_DIR}
+                               COMMAND ${CMAKE_COMMAND} -E make_directory ${COVERAGE_REPORT_DIR}
+                               COMMAND ${GENHTML_EXECUTABLE} --legend --show-details -t "${PROJECT_NAME} test coverage" -o ${COVERAGE_REPORT_DIR} ${COVERAGE_FILTERED_FILE}
+                               DEPENDS ${COVERAGE_FILTERED_FILE}
+                               COMMENT "Generating HTML coverage report in ${COVERAGE_REPORT_DIR}"
+                               VERBATIM)
+                               
+            ADD_CUSTOM_TARGET(coverage-html
+                              DEPENDS ${COVERAGE_REPORT_DIR})
+                              
+        ENDIF()
+        
+        # xml coverage report
+        IF(GCOVR_FOUND)
+        
+            MESSAGE(STATUS "Enabling XML coverage report")
+        
+            # gcovr cannot write directly to a file so the execution needs to
+            # be wrapped in a cmake file that generates the file output
+            FILE(WRITE ${COVERAGE_XML_COMMAND_FILE}
+                 "SET(ENV{LANG} en)\n")
+            FILE(APPEND ${COVERAGE_XML_COMMAND_FILE}
+                 "EXECUTE_PROCESS(COMMAND \"${GCOVR_EXECUTABLE}\" -x -r \"${CMAKE_SOURCE_DIR}\" OUTPUT_FILE \"${COVERAGE_XML_FILE}\" WORKING_DIRECTORY \"${CMAKE_BINARY_DIR}\")\n")
+        
+            ADD_CUSTOM_COMMAND(OUTPUT ${COVERAGE_XML_FILE}
+                               COMMAND ${CMAKE_COMMAND} ARGS -P ${COVERAGE_XML_COMMAND_FILE}
+                               COMMENT "Generating coverage XML report"
+                               VERBATIM)
+                               
+            ADD_CUSTOM_TARGET(coverage-xml
+                              DEPENDS ${COVERAGE_XML_FILE})
+        
+        ENDIF()
+        
+        # provide a global coverage target executing both steps if available
+        SET(GLOBAL_DEPENDS "")
+        IF(LCOV_FOUND)
+            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_REPORT_DIR})
+        ENDIF()
+        IF(GCOVR_FOUND)
+            LIST(APPEND GLOBAL_DEPENDS ${COVERAGE_XML_FILE})
+        ENDIF()
+        IF(LCOV_FOUND OR GCOVR_FOUND)
+            ADD_CUSTOM_TARGET(coverage
+                              DEPENDS ${GLOBAL_DEPENDS})
+        ENDIF()
+                          
+    ENDIF()
+
+ENDFUNCTION()   

=== added file 'cmake/modules/FindGtest.cmake'
--- cmake/modules/FindGtest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindGtest.cmake	2014-04-11 16:06:36 +0000
@@ -0,0 +1,53 @@
+include(ExternalProject)
+include(FindPackageHandleStandardArgs)
+
+#gtest
+set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
+find_path(GTEST_INCLUDE_DIR gtest/gtest.h
+            HINTS ${GTEST_INSTALL_DIR})
+
+#gmock
+find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
+          HINTS /usr/src)
+if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
+    message(FATAL_ERROR "google-mock package not found")
+endif()
+
+set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
+find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
+
+set(GMOCK_PREFIX gmock)
+set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
+set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
+
+set(GTEST_CMAKE_ARGS "")
+if (${MIR_IS_CROSS_COMPILING})
+    set(GTEST_CMAKE_ARGS
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+endif()
+
+ExternalProject_Add(
+    GMock
+    #where to build in source tree
+    PREFIX ${GMOCK_PREFIX}
+    #where the source is external to the project
+    SOURCE_DIR ${GMOCK_INSTALL_DIR}
+    #forward the compilers to the subproject so cross-arch builds work
+    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
+    BINARY_DIR ${GMOCK_BINARY_DIR}
+
+    #we don't need to install, so skip
+    INSTALL_COMMAND ""
+)
+
+set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
+set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
+set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
+set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
+set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
+set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
+
+find_package_handle_standard_args(GTest  DEFAULT_MSG
+                                    GMOCK_INCLUDE_DIR
+                                    GTEST_INCLUDE_DIR)

=== added file 'cmake/modules/FindLcov.cmake'
--- cmake/modules/FindLcov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindLcov.cmake	2014-04-11 16:06:36 +0000
@@ -0,0 +1,29 @@
+# - Find lcov 
+# Will define:
+#
+# LCOV_EXECUTABLE - the lcov binary
+# GENHTML_EXECUTABLE - the genhtml executable
+#
+# Copyright (C) 2010 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# 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 General Public License for more details.
+#
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PROGRAM(LCOV_EXECUTABLE lcov)
+FIND_PROGRAM(GENHTML_EXECUTABLE genhtml)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lcov DEFAULT_MSG LCOV_EXECUTABLE GENHTML_EXECUTABLE)
+
+# only visible in advanced view
+MARK_AS_ADVANCED(LCOV_EXECUTABLE GENHTML_EXECUTABLE)

=== added file 'cmake/modules/Findgcovr.cmake'
--- cmake/modules/Findgcovr.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/Findgcovr.cmake	2014-04-11 16:06:36 +0000
@@ -0,0 +1,31 @@
+# - Find gcovr scrip 
+# Will define:
+#
+# GCOVR_EXECUTABLE - the gcovr script
+#
+# Uses:
+#
+# GCOVR_ROOT - root to search for the script
+#
+# Copyright (C) 2011 by Johannes Wienke <jwienke at techfak dot uni-bielefeld dot de>
+#
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General
+# Public License as published by the Free Software Foundation;
+# either version 2, or (at your option)
+# any later version.
+#
+# 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 General Public License for more details.
+#
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PROGRAM(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gcovr DEFAULT_MSG GCOVR_EXECUTABLE)
+
+# only visible in advanced view
+MARK_AS_ADVANCED(GCOVR_EXECUTABLE)

=== added file 'cmake/modules/ParseArguments.cmake'
--- cmake/modules/ParseArguments.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/ParseArguments.cmake	2014-04-11 16:06:36 +0000
@@ -0,0 +1,52 @@
+# Parse arguments passed to a function into several lists separated by
+# upper-case identifiers and options that do not have an associated list e.g.:
+#
+# SET(arguments
+#   hello OPTION3 world
+#   LIST3 foo bar
+#   OPTION2
+#   LIST1 fuz baz
+#   )
+# PARSE_ARGUMENTS(ARG "LIST1;LIST2;LIST3" "OPTION1;OPTION2;OPTION3" ${arguments})
+#
+# results in 7 distinct variables:
+#  * ARG_DEFAULT_ARGS: hello;world
+#  * ARG_LIST1: fuz;baz
+#  * ARG_LIST2:
+#  * ARG_LIST3: foo;bar
+#  * ARG_OPTION1: FALSE
+#  * ARG_OPTION2: TRUE
+#  * ARG_OPTION3: TRUE
+#
+# taken from http://www.cmake.org/Wiki/CMakeMacroParseArguments 
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+    SET(DEFAULT_ARGS)
+    FOREACH(arg_name ${arg_names})    
+        SET(${prefix}_${arg_name})
+    ENDFOREACH(arg_name)
+    FOREACH(option ${option_names})
+        SET(${prefix}_${option} FALSE)
+    ENDFOREACH(option)
+    
+    SET(current_arg_name DEFAULT_ARGS)
+    SET(current_arg_list)
+    FOREACH(arg ${ARGN})            
+        SET(larg_names ${arg_names})    
+        LIST(FIND larg_names "${arg}" is_arg_name)                   
+        IF (is_arg_name GREATER -1)
+            SET(${prefix}_${current_arg_name} ${current_arg_list})
+            SET(current_arg_name ${arg})
+            SET(current_arg_list)
+        ELSE (is_arg_name GREATER -1)
+            SET(loption_names ${option_names})    
+            LIST(FIND loption_names "${arg}" is_option)            
+            IF (is_option GREATER -1)
+                SET(${prefix}_${arg} TRUE)
+            ELSE (is_option GREATER -1)
+                SET(current_arg_list ${current_arg_list} ${arg})
+            ENDIF (is_option GREATER -1)
+        ENDIF (is_arg_name GREATER -1)
+    ENDFOREACH(arg)
+    SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)

=== removed file 'common-installs-config.pri'
--- common-installs-config.pri	2013-12-03 11:06:36 +0000
+++ common-installs-config.pri	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-#-----------------------------------------------------------------------------
-# Common installation configuration for all projects.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# default installation target for applications
-#-----------------------------------------------------------------------------
-contains( TEMPLATE, app ) {
-    target.path  = $${INSTALL_PREFIX}/bin
-    INSTALLS    += target
-    message("====")
-    message("==== INSTALLS += target")
-}
-
-#-----------------------------------------------------------------------------
-# default installation target for libraries
-#-----------------------------------------------------------------------------
-contains( TEMPLATE, lib ) {
-
-    target.path  = $${INSTALL_LIBDIR}
-    INSTALLS    += target
-    message("====")
-    message("==== INSTALLS += target")
-
-    # reset the .pc file's `prefix' variable
-    #include( tools/fix-pc-prefix.pri )
-
-}
-
-#-----------------------------------------------------------------------------
-# target for header files
-#-----------------------------------------------------------------------------
-!isEmpty( headers.files ) {
-    headers.path  = $${INSTALL_PREFIX}/include/ubuntu/download_manager
-    INSTALLS     += headers
-    message("====")
-    message("==== INSTALLS += headers")
-} else {
-    message("====")
-    message("==== NOTE: Remember to add your API headers into `headers.files' for installation!")
-}
-
-
-# End of File

=== removed file 'common-pkgconfig.pri'
--- common-pkgconfig.pri	2013-12-03 11:06:36 +0000
+++ common-pkgconfig.pri	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Include this file after defining the pkgconfig.files variable
-
-!isEmpty(pkgconfig.files) {
-    QMAKE_SUBSTITUTES += $${pkgconfig.files}.in
-    pkgconfig.CONFIG = no_check_exist
-    pkgconfig.path  = $${INSTALL_LIBDIR}/pkgconfig
-    QMAKE_EXTRA_TARGETS += pkgconfig
-
-    QMAKE_CLEAN += $${pkgconfig.files}
-}

=== removed file 'common-project-config.pri'
--- common-project-config.pri	2014-01-22 15:16:14 +0000
+++ common-project-config.pri	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-#-----------------------------------------------------------------------------
-# Common configuration for all projects.
-#-----------------------------------------------------------------------------
-
-QT             -= gui
-CONFIG         += link_pkgconfig
-
-TOP_SRC_DIR     = $$PWD
-TOP_BUILD_DIR   = $${TOP_SRC_DIR}/$${BUILD_DIR}
-QMAKE_LIBDIR   += $${TOP_BUILD_DIR}
-INCLUDEPATH    += $${TOP_SRC_DIR}
-QMAKE_CXXFLAGS +=  -std=c++11 -Werror
-
-#-----------------------------------------------------------------------------
-# setup the installation prefix
-#-----------------------------------------------------------------------------
-INSTALL_PREFIX = /usr  # default installation prefix
-
-# default prefix can be overriden by defining PREFIX when running qmake
-isEmpty( PREFIX ) {
-    message("====")
-    message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
-    message("==== (current installation path is `$${INSTALL_PREFIX}')")
-} else {
-    INSTALL_PREFIX = $${PREFIX}
-    message("====")
-    message("==== install prefix set to `$${INSTALL_PREFIX}'")
-}
-
-ARCH = $$system(uname -m)
-contains( ARCH, x86_64 ) {
-    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/x86_64-linux-gnu
-} else {
-    contains( ARCH, i686) {
-        INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/i386-linux-gnu
-    } else {
-        INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib/arm-linux-gnueabihf
-    }
-}
-
-# default library directory can be overriden by defining LIBDIR when
-# running qmake
-isEmpty( LIBDIR ) {
-    message("====")
-    message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
-    message("==== (current installation path is `$${INSTALL_LIBDIR}')")
-} else {
-    INSTALL_LIBDIR = $${LIBDIR}
-    message("====")
-    message("==== library install path set to `$${INSTALL_LIBDIR}'")
-}
-
-include( coverage.pri )
-
-# End of File
-

=== removed file 'common-vars.pri'
--- common-vars.pri	2013-12-03 11:06:36 +0000
+++ common-vars.pri	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#-----------------------------------------------------------------------------
-# Common variables for all projects.
-#-----------------------------------------------------------------------------
-DEFINES += BUILDING_UBUNTU_DOWNLOAD_MANAGER
-
-
-#-----------------------------------------------------------------------------
-# Project name (used e.g. in include file and doc install path).
-#-----------------------------------------------------------------------------
-PROJECT_NAME = ubuntu-download-manager
-
-
-#-----------------------------------------------------------------------------
-# Project version
-#-----------------------------------------------------------------------------
-PROJECT_VERSION = 0.3
-
-#-----------------------------------------------------------------------------
-# Library version
-#-----------------------------------------------------------------------------
-VERSION = 0.3

=== removed file 'common.pri'
--- common.pri	2013-07-03 11:02:59 +0000
+++ common.pri	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-contains(QT_VERSION, ^4.*) {
- error("Use at least Qt 5.x");
-}
-
-include( coverage.pri )

=== removed file 'coverage.pri'
--- coverage.pri	2013-07-03 11:02:59 +0000
+++ coverage.pri	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# Coverage Support
-# --------------------------------
-# In order to generate coverage report you will have to:
-# 0) Install following packages: gcovr lcov
-# 1) Configure project with coverage enabled
-# 1.1) qmake CONFIG+=coverage
-# 2) Compile project with coverage target
-# 2.1) xml report
-# 2.1.1) make coverage-xml
-# 2.2) html report
-# 2.2.1) make coverage-html
-# 
-# In order to regenerate the report you might need to do following steps:
-# 1) make distclean
-# 2) qmake -r CONFIG+=coverage
-# 3) make coverage-html or make coverage-xml
-# --------------------------------
-
-CONFIG(coverage) {
-    OBJECTS_DIR =
-    MOC_DIR =
-    TOP_SRC_DIR = $$PWD
-
-    LIBS += -lgcov
-    QMAKE_CXXFLAGS += --coverage
-    QMAKE_LDFLAGS += --coverage
-
-    QMAKE_EXTRA_TARGETS += coverage cov
-    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
-        generate-coverage-html clean-coverage-html coverage-xml \
-        generate-xml generate-coverage-xml clean-coverage-xml
-
-    clean-gcno.commands = \
-        "@echo Removing old coverage instrumentation"; \
-        "find -name '*.gcno' -print | xargs -r rm"
-
-    clean-gcda.commands = \
-        "@echo Removing old coverage results"; \
-        "find -name '*.gcda' -print | xargs -r rm"
-  
-    coverage-html.depends = clean-gcda check generate-coverage-html
-  
-    generate-coverage-html.commands = \
-        "@echo Collecting coverage data"; \
-        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
-        "lcov --extract coverage.info \"*/modules/*.cpp\" -o coverage.info"; \
-        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
-        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
-  
-    clean-coverage-html.depends = clean-gcda
-    clean-coverage-html.commands = \
-        "lcov --directory $${TOP_SRC_DIR} -z"; \
-        "rm -rf coverage.info coverage-html"
-
-    coverage-xml.depends = clean-gcda check generate-coverage-xml
-
-    generate-coverage-xml.commands = \
-        "@echo Generating coverage GCOVR XML report"; \
-        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"unit/.*\" -e \".*\\.h\""
-
-    clean-coverage-xml.depends = clean-gcda
-    clean-coverage-xml.commands = \
-        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
-
-    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
-}

=== modified file 'debian/control'
--- debian/control	2014-03-20 16:23:00 +0000
+++ debian/control	2014-04-11 16:06:36 +0000
@@ -1,7 +1,10 @@
 Source: ubuntu-download-manager
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper (>= 9),
+               dbus-test-runner,
+               google-mock,
                qt5-qmake,
                qt5-default,
                qtbase5-dev,
@@ -10,7 +13,6 @@
                libqt5sql5-sqlite,
                libnih-dbus-dev,
                libgoogle-glog-dev,
-               dbus-test-runner,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-test-plugin
@@ -22,10 +24,47 @@
 # upstream branch
 Vcs-Bzr: lp:ubuntu-download-manager
 
+Package: libudm-common0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Upload Download Manager - shared common library
+ Upload Download Manager performs uploads and downloads from a centralized
+ location.
+ .
+ This package includes the common shared library between the client lib and the
+ service lib.
+
+Package: libudm-common-dev
+Section: libdevel
+Architecture: any
+Depends: libudm-common0 (= ${binary:Version}),
+         qtbase5-dev,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: QT library for Ubuntu Download Manager - development files
+ This package contains the common headers shared between the client library and
+ the daemon library.
+
+Package: libudm-priv0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libudm-common0 (= ${binary:Version}),
+Breaks: libubuntu-download-manager-priv1
+Replaces: libubuntu-download-manager-priv1
+Description: Upload Download Manager - shared private library
+ Upload Download Manager performs downloads from a centralized location.
+ .
+ This package includes the private shared library.
+
 Package: libubuntu-download-manager-common0
 Section: libs
 Architecture: any
-Depends: ${misc:Depends},
+Depends: libudm-common0 (= ${binary:Version}),
+         ${misc:Depends},
          ${shlibs:Depends},
 Breaks: ubuntu-download-manager-common1
 Replaces: ubuntu-download-manager-common1
@@ -38,7 +77,8 @@
 Package: libubuntu-download-manager-common-dev
 Section: libdevel
 Architecture: any
-Depends: libubuntu-download-manager-common0 (= ${binary:Version}),
+Depends: libudm-common-dev (= ${binary:Version}),
+         libubuntu-download-manager-common0 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
          ${misc:Depends}
@@ -48,24 +88,12 @@
  This package contains the common headers shared between the client library and
  the daemon library.
 
-Package: libubuntu-download-manager-priv0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libubuntu-download-manager-common0 (= ${binary:Version}),
-Breaks: ubuntu-download-manager-priv1
-Replaces: ubuntu-download-manager-priv1
-Description: Ubuntu Download Manager - shared private library
- Ubuntu Download Manager performs downloads from a centralized location.
- .
- This package includes the private shared library.
-
 Package: libubuntu-download-manager-client0
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libudm-common0 (= ${binary:Version}),
          libubuntu-download-manager-common0 (= ${binary:Version}),
 Breaks: ubuntu-download-manager-client1
 Replaces: ubuntu-download-manager-client1
@@ -77,7 +105,8 @@
 Package: libubuntu-download-manager-client-dev
 Section: libdevel
 Architecture: any
-Depends: libubuntu-download-manager-common-dev (= ${binary:Version}),
+Depends: libudm-common-dev (= ${binary:Version}),
+         libubuntu-download-manager-common-dev (= ${binary:Version}),
          libubuntu-download-manager-client0 (= ${binary:Version}),
          qtbase5-dev,
          ${shlibs:Depends},
@@ -88,22 +117,63 @@
  This package contains the header that can be used to allow an application use
  the Ubuntu Download Manager client library.
 
+Package: libubuntu-upload-manager-common0
+Section: libs
+Architecture: any
+Depends: libudm-common0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Ubuntu Upload Manager - shared common library
+ Ubuntu Upload Manager performs uploads from a centralized location.
+ .
+ This package includes the common shared library between the client lib and the
+ service lib.
+
+Package: libubuntu-upload-manager-common-dev
+Section: libdevel
+Architecture: any
+Depends: libudm-common-dev (= ${binary:Version}),
+         libubuntu-download-manager-common0 (= ${binary:Version}),
+         qtbase5-dev,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: QT library for Ubuntu Upload Manager - development files
+ This package contains the common headers shared between the client library and
+ the daemon library.
+
 Package: ubuntu-download-manager
 Section: net
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libubuntu-download-manager-priv0 (= ${binary:Version}),
+         libudm-common0 (= ${binary:Version}),
+         libudm-priv0 (= ${binary:Version}),
+         libubuntu-download-manager-common0 (= ${binary:Version}),
 Description: Ubuntu Download Manager - daemon
  Ubuntu Download Manager performs downloads from a centralized location.
  .
  This package includes the daemon.
 
+Package: ubuntu-upload-manager
+Section: net
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libudm-common0 (= ${binary:Version}),
+         libudm-priv0 (= ${binary:Version}),
+         libubuntu-upload-manager-common0 (= ${binary:Version}),
+Description: Ubuntu Upload Manager - daemon
+ Ubuntu Upload Manager performs uploads from a centralized location.
+ .
+ This package includes the daemon.
+
 Package: qtdeclarative5-ubuntu-download-manager0.1
 Section: net
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libudm-common0 (= ${binary:Version}),
+         libubuntu-download-manager-common0 (= ${binary:Version}),
          libubuntu-download-manager-client0 (= ${binary:Version})
 Description: Ubuntu Download Manager Plugin
  This package contains a QML Plugin to handle downloads from a pure QML

=== modified file 'debian/libubuntu-download-manager-client-dev.install'
--- debian/libubuntu-download-manager-client-dev.install	2014-02-10 18:04:03 +0000
+++ debian/libubuntu-download-manager-client-dev.install	2014-04-11 16:06:36 +0000
@@ -2,5 +2,5 @@
 usr/include/ubuntu/download_manager/manager.h
 usr/include/ubuntu/download_manager/download.h
 usr/include/ubuntu/download_manager/group_download.h
-usr/lib/*/pkgconfig/ubuntu-download-manager-client.pc
+usr/share/pkgconfig/ubuntu-download-manager-client.pc
 usr/lib/*/libubuntu-download-manager-client.so

=== modified file 'debian/libubuntu-download-manager-common-dev.install'
--- debian/libubuntu-download-manager-common-dev.install	2014-02-19 19:01:37 +0000
+++ debian/libubuntu-download-manager-common-dev.install	2014-04-11 16:06:36 +0000
@@ -2,10 +2,5 @@
 usr/include/ubuntu/download_manager/metatypes.h
 usr/include/ubuntu/download_manager/download_struct.h
 usr/include/ubuntu/download_manager/group_download_struct.h
-usr/include/ubuntu/download_manager/auth_error_struct.h
-usr/include/ubuntu/download_manager/http_error_struct.h
-usr/include/ubuntu/download_manager/network_error_struct.h
-usr/include/ubuntu/download_manager/process_error_struct.h
-usr/include/ubuntu/download_manager/metadata.h
-usr/lib/*/pkgconfig/ubuntu-download-manager-common.pc
+usr/share/pkgconfig/ubuntu-download-manager-common.pc
 usr/lib/*/libubuntu-download-manager-common.so

=== removed file 'debian/libubuntu-download-manager-priv0.install'
--- debian/libubuntu-download-manager-priv0.install	2014-02-10 18:04:03 +0000
+++ debian/libubuntu-download-manager-priv0.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu-download-manager-priv.so.0*

=== added file 'debian/libubuntu-upload-manager-common-dev.install'
--- debian/libubuntu-upload-manager-common-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-upload-manager-common-dev.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,5 @@
+usr/include/ubuntu/upload_manager/common.h
+usr/include/ubuntu/upload_manager/metatypes.h
+usr/include/ubuntu/upload_manager/upload_struct.h
+usr/share/pkgconfig/ubuntu-upload-manager-common.pc
+usr/lib/*/libubuntu-upload-manager-common.so

=== added file 'debian/libubuntu-upload-manager-common0.install'
--- debian/libubuntu-upload-manager-common0.install	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-upload-manager-common0.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libubuntu-upload-manager-common.so.0*

=== added file 'debian/libudm-common-dev.install'
--- debian/libudm-common-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libudm-common-dev.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,7 @@
+usr/include/ubuntu/transfers/metadata.h
+usr/include/ubuntu/transfers/errors/auth_error_struct.h
+usr/include/ubuntu/transfers/errors/http_error_struct.h
+usr/include/ubuntu/transfers/errors/network_error_struct.h
+usr/include/ubuntu/transfers/errors/process_error_struct.h
+usr/share/pkgconfig/udm-common.pc
+usr/lib/*/libudm-common.so

=== added file 'debian/libudm-common0.install'
--- debian/libudm-common0.install	1970-01-01 00:00:00 +0000
+++ debian/libudm-common0.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libudm-common.so.0*

=== added file 'debian/libudm-priv0.install'
--- debian/libudm-priv0.install	1970-01-01 00:00:00 +0000
+++ debian/libudm-priv0.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libudm-priv-common.so.0*

=== modified file 'debian/qtdeclarative5-ubuntu-download-manager0.1.install'
--- debian/qtdeclarative5-ubuntu-download-manager0.1.install	2014-03-20 11:41:09 +0000
+++ debian/qtdeclarative5-ubuntu-download-manager0.1.install	2014-04-11 16:06:36 +0000
@@ -1,2 +1,2 @@
-usr/lib/*/qt5/qml/UbuntuDownloadManager.0.1/libUbuntuDownloadManager.so
-usr/lib/*/qt5/qml/UbuntuDownloadManager.0.1/qmldir
+usr/lib/*/qt5/qml/UbuntuDownloadManager/libUbuntuDownloadManager.so
+usr/lib/*/qt5/qml/UbuntuDownloadManager/qmldir

=== modified file 'debian/rules'
--- debian/rules	2014-03-19 10:42:33 +0000
+++ debian/rules	2014-04-11 16:06:36 +0000
@@ -7,8 +7,24 @@
 
 export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+# Work around pointer equality problem with -Bsymbolic-functions:
+# http://lists.linaro.org/pipermail/linaro-toolchain/2014-January/003944.html
+ifneq (,$(findstring powerpc,$(DEB_HOST_GNU_TYPE)))
+export DEB_BUILD_MAINT_OPTIONS := hardening=+pie
+endif
+
+ifneq (,$(findstring arm,$(DEB_HOST_GNU_TYPE)))
+export DEB_BUILD_MAINT_OPTIONS := hardening=+pie
+endif
+
+
+ifneq (,$(findstring aarch64,$(DEB_HOST_GNU_TYPE)))
+export DEB_BUILD_MAINT_OPTIONS := hardening=+pie
+endif
+
 override_dh_auto_configure:
-	dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 dh_auto_install:
 	rm -f debian/tmp/usr/lib/*.so

=== modified file 'debian/ubuntu-download-manager.install'
--- debian/ubuntu-download-manager.install	2013-09-20 12:52:33 +0000
+++ debian/ubuntu-download-manager.install	2014-04-11 16:06:36 +0000
@@ -1,4 +1,4 @@
 usr/bin/ubuntu-download-manager
 usr/share/dbus-1/services/ubuntu-download-manager.service
-usr/share/dbus-1/system-services/com.canonical.applications.Downloader.service
+etc/dbus-1/system-services/com.canonical.applications.Downloader.service
 etc/dbus-1/system.d/com.canonical.applications.Downloader.conf

=== added file 'debian/ubuntu-upload-manager.install'
--- debian/ubuntu-upload-manager.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-upload-manager.install	2014-04-11 16:06:36 +0000
@@ -0,0 +1,4 @@
+usr/bin/ubuntu-upload-manager
+usr/share/dbus-1/services/ubuntu-upload-manager.service
+etc/dbus-1/system-services/com.canonical.applications.Uploader.service
+etc/dbus-1/system.d/com.canonical.applications.Uploader.conf

=== modified file 'docs/com.canonical.applications.download.xml'
--- docs/com.canonical.applications.download.xml	2014-02-11 15:35:52 +0000
+++ docs/com.canonical.applications.download.xml	2014-04-11 16:06:36 +0000
@@ -22,6 +22,10 @@
         <arg name="speed" type="t" direction="out"/>
     </method>
 
+    <method name="setDestinationDir">
+        <arg name="path" type="s" direction="in"/>
+    </method>
+
     <method name="allowGSMDownload">
         <arg name="allowed" type="b" direction="in"/>
     </method>

=== added file 'docs/com.canonical.applications.upload.xml'
--- docs/com.canonical.applications.upload.xml	1970-01-01 00:00:00 +0000
+++ docs/com.canonical.applications.upload.xml	2014-04-11 16:06:36 +0000
@@ -0,0 +1,73 @@
+<node>
+  <interface name="com.canonical.applications.Upload">
+
+    <method name="progress">
+        <arg name="uploaded" type="t" direction="out"/>
+    </method>
+
+    <method name="metadata">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <arg name="data" type="a{sv}" direction="out" />
+    </method>
+
+    <method name="setThrottle">
+        <arg name="speed" type="t" direction="in"/>
+    </method>
+
+    <method name="throttle">
+        <arg name="speed" type="t" direction="out"/>
+    </method>
+
+    <method name="allowMobileUpload">
+        <arg name="allowed" type="b" direction="in"/>
+    </method>
+
+    <method name="isMobileUploadAllowed">
+        <arg name="allowed" type="b" direction="out"/>
+    </method>
+
+    <method name="start" />
+    <method name="cancel" />
+
+    <signal name="started">
+        <arg name="success" type="b" direction="out"/>
+    </signal>
+
+    <signal name="canceled">
+        <arg name="success" type="b" direction="out"/>
+    </signal>
+
+    <signal name="finished">
+    </signal>
+
+    <signal name="error">
+        <arg name="error" type="s" direction="out"/>
+    </signal>
+
+    <signal name="authError">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="AuthErrorStruct"/>
+        <arg name="error" type="(is)" direction="out"/>
+    </signal>
+
+    <signal name="httpError">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="HttpErrorStruct"/>
+        <arg name="error" type="(is)" direction="out"/>
+    </signal>
+
+    <signal name="networkError">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="NetworkErrorStruct"/>
+        <arg name="error" type="(is)" direction="out"/>
+    </signal>
+
+    <signal name="processError">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="ProcessErrorStruct"/>
+        <arg name="error" type="(isiss)" direction="out"/>
+    </signal>
+
+    <signal name="progress">
+        <arg name="uploded" type="t" direction="out"/>
+        <arg name="total" type="t" direction="out"/>
+    </signal>
+
+ </interface>
+</node>

=== added file 'docs/com.canonical.applications.upload_manager.xml'
--- docs/com.canonical.applications.upload_manager.xml	1970-01-01 00:00:00 +0000
+++ docs/com.canonical.applications.upload_manager.xml	2014-04-11 16:06:36 +0000
@@ -0,0 +1,52 @@
+<node>
+  <interface name="com.canonical.applications.UploadManager">
+    <method name="createUpload">
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="UploadStruct"/>
+        <arg name="upload" type="(ssa{sv}a{ss})" direction="in" />
+        <arg name="uploadPath" type="o" direction="out" />
+    </method>
+
+    <method name="createMmsUpload">
+        <arg name="url" type="s" direction="in" />
+        <arg name="file" type="s" direction="in" />
+        <arg name="hostname" type="s" direction="in" />
+        <arg name="port" type="i" direction="in" />
+        <arg name="username" type="s" direction="in" />
+        <arg name="password" type="s" direction="in" />
+        <arg name="uploadPath" type="o" direction="out" />
+    </method>
+
+    <method name="getAllUploads">
+        <arg name="uploads" type="ao" direction="out" />
+    </method>
+
+    <method name="getAllUploadsWithMetadata">
+        <arg name="name" type="s" direction="in"/>
+        <arg name="value" type="s" direction="in"/>
+        <arg name="uploads" type="ao" direction="out" />
+    </method>
+
+    <method name="setDefaultThrottle">
+        <arg name="speed" type="t" direction="in"/>
+    </method>
+
+    <method name="defaultThrottle">
+        <arg name="speed" type="t" direction="out"/>
+    </method>
+
+    <method name="allowMobileUpload">
+        <arg name="allowed" type="b" direction="in"/>
+    </method>
+
+    <method name="isMobileUploadAllowed">
+        <arg name="allowed" type="b" direction="out"/>
+    </method>
+
+    <method name="exit" />
+
+    <signal name="uploadCreated">
+        <arg name="path" type="o" direction="out"/>
+    </signal>
+
+ </interface>
+</node>

=== removed file 'download-manager.pro'
--- download-manager.pro	2014-03-06 12:18:32 +0000
+++ download-manager.pro	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-include(common.pri)
-
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += \
-    ubuntu-download-manager-common \
-    ubuntu-download-manager-priv \
-    ubuntu-download-manager \
-    ubuntu-download-manager-client \
-    ubuntu-download-manager-test-lib \
-    ubuntu-download-manager-tests \
-    ubuntu-download-manager-common-tests \
-    ubuntu-download-manager-test-daemon \
-    ubuntu-download-manager-client-tests \
-    ubuntu-download-manager-client-tests \
-    ubuntu-download-manager-plugin
-
-ubuntu-download-manager-priv.depends = ubuntu-download-manager-common
-
-ubuntu-download-manager.depends = ubuntu-download-manager-priv
-
-ubuntu-download-manager-client.depends = ubuntu-download-manager-common
-
-ubuntu-download-manager-common-tests.depends += ubuntu-download-manager-test-daemon
-ubuntu-download-manager-common-tests.depends += ubuntu-download-manager-common
-ubuntu-download-manager-common-tests.depends += ubuntu-download-manager-test-lib
-
-ubuntu-download-manager-tests.depends += ubuntu-download-manager-test-lib
-ubuntu-download-manager-tests.depends += ubuntu-download-manager-priv
-
-ubuntu-download-manager-client-tests.depends += ubuntu-download-manager-test-daemon
-ubuntu-download-manager-client-tests.depends += ubuntu-download-manager-test-lib
-ubuntu-download-manager-client-tests.depends += ubuntu-download-manager-client

=== added directory 'src'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,19 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(common)
+add_subdirectory(downloads)
+add_subdirectory(uploads)

=== added directory 'src/common'
=== added file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/common/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,18 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(priv)
+add_subdirectory(public)

=== added directory 'src/common/priv'
=== added file 'src/common/priv/CMakeLists.txt'
--- src/common/priv/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/common/priv/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,87 @@
+set(TARGET udm-priv-common)
+
+set(SOURCES
+	ubuntu/transfers/base_daemon.cpp
+	ubuntu/transfers/base_manager.cpp
+	ubuntu/transfers/queue.cpp
+	ubuntu/transfers/transfer.cpp
+	ubuntu/transfers/system/apn_proxy.cpp
+	ubuntu/transfers/system/apn_request_factory.cpp
+	ubuntu/transfers/system/apparmor.cpp
+	ubuntu/transfers/system/application.cpp
+        ubuntu/transfers/system/cryptographic_hash.cpp
+	ubuntu/transfers/system/dbus_proxy.cpp
+	ubuntu/transfers/system/file_manager.cpp
+	ubuntu/transfers/system/filename_mutex.cpp
+	ubuntu/transfers/system/network_reply.cpp
+	ubuntu/transfers/system/process.cpp
+	ubuntu/transfers/system/process_factory.cpp
+	ubuntu/transfers/system/request_factory.cpp
+	ubuntu/transfers/system/system_network_info.cpp
+	ubuntu/transfers/system/timer.cpp
+	ubuntu/transfers/system/uuid_factory.cpp
+	ubuntu/transfers/system/uuid_utils.cpp
+)
+
+set(HEADERS
+	ubuntu/transfers/adaptor_factory.h
+	ubuntu/transfers/base_daemon.h
+	ubuntu/transfers/base_manager.h
+	ubuntu/transfers/manager_factory.h
+	ubuntu/transfers/queue.h
+	ubuntu/transfers/transfer.h
+	ubuntu/transfers/system/apn_proxy.h
+	ubuntu/transfers/system/apn_request_factory.h
+	ubuntu/transfers/system/apparmor.h
+	ubuntu/transfers/system/application.h
+        ubuntu/transfers/system/cryptographic_hash.h
+	ubuntu/transfers/system/dbus_proxy.h
+	ubuntu/transfers/system/file_manager.h
+	ubuntu/transfers/system/filename_mutex.h
+	ubuntu/transfers/system/network_reply.h
+	ubuntu/transfers/system/process.h
+	ubuntu/transfers/system/process_factory.h
+	ubuntu/transfers/system/request_factory.h
+	ubuntu/transfers/system/system_network_info.h
+	ubuntu/transfers/system/timer.h
+	ubuntu/transfers/system/uuid_factory.h
+	ubuntu/transfers/system/uuid_utils.h
+)
+
+include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${Qt5Sql_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+
+add_library(${TARGET} SHARED
+	${HEADERS}
+	${SOURCES}
+)
+
+set_target_properties(
+	${TARGET}
+
+	PROPERTIES
+	VERSION ${UDM_VERSION_MAJOR}.${UDM_VERSION_MINOR}.${UDM_VERSION_PATCH}
+	SOVERSION ${UDM_VERSION_MAJOR}
+)
+
+link_directories(${NIH_DBUS_LIBDIR})
+link_directories(${GLOG_DBUS_LIBDIR})
+
+target_link_libraries(${TARGET}
+	${NIH_DBUS_LIBRARIES}
+	${GLOG_LIBRARIES}
+	${Qt5Network_LIBRARIES}
+	${Qt5Sql_LIBRARIES}
+	${Qt5SystemInfo_LIBRARIES}
+	${Qt5Core_LIBRARIES}
+	${Qt5DBus_LIBRARIES}
+	udm-common
+)
+
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})

=== added directory 'src/common/priv/ubuntu'
=== added directory 'src/common/priv/ubuntu/transfers'
=== added file 'src/common/priv/ubuntu/transfers/adaptor_factory.h'
--- src/common/priv/ubuntu/transfers/adaptor_factory.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/adaptor_factory.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_GENERAL_ADAPTOR_FACTORY_H
+#define UBUNTU_GENERAL_ADAPTOR_FACTORY_H
+
+#include <QObject>
+#include "base_manager.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+class AdaptorFactory : public QObject {
+ public:
+    explicit AdaptorFactory(QObject *parent = 0)
+        : QObject(parent) {}
+
+    virtual QObject* createAdaptor(BaseManager* man) = 0;
+};
+
+}  // General
+
+}  // Ubuntu
+
+#endif // UBUNTU_GENERAL_ADAPTOR_FACTORY_H

=== renamed file 'ubuntu-download-manager-priv/downloads/daemon.cpp' => 'src/common/priv/ubuntu/transfers/base_daemon.cpp'
--- ubuntu-download-manager-priv/downloads/daemon.cpp	2014-02-21 11:52:42 +0000
+++ src/common/priv/ubuntu/transfers/base_daemon.cpp	2014-04-11 16:06:36 +0000
@@ -16,15 +16,17 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDebug>
 #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 <glog/logging.h>
+#include "ubuntu/transfers/system/application.h"
+#include "ubuntu/transfers/system/logger.h"
+#include "ubuntu/transfers/system/timer.h"
+#include "adaptor_factory.h"
+#include "manager_factory.h"
+#include "base_daemon.h"
 
 
 namespace {
@@ -32,298 +34,203 @@
     const QString SELFSIGNED_CERT = "-self-signed-certs";
     const QString STOPPABLE =  "-stoppable";
     const QString LOG_DIR= "-log-dir";
+    const int DEFAULT_TIMEOUT = 30000;
 }
 
 namespace Ubuntu {
 
-namespace DownloadManager {
-
-namespace Daemon {
-
-/**
- * PRIVATE IMPLEMENATION
- */
-
-class DaemonPrivate {
-    Q_DECLARE_PUBLIC(Daemon)
-
- public:
-    explicit DaemonPrivate(Daemon* parent)
-        : q_ptr(parent) {
-        _app = new Application();
-        _conn = new DBusConnection();
-        _shutDownTimer = new Timer();
-        init();
-    }
-
-    DaemonPrivate(Application* app,
-                  DBusConnection* conn,
-                  Timer* timer,
-                  Manager* man,
-                  Daemon* parent)
-        : _app(app),
-          _shutDownTimer(timer),
-          _conn(conn),
-          _downInterface(man),
-          q_ptr(parent) {
-        init();
-    }
-
-    ~DaemonPrivate() {
-        // no need to delete the adaptor because the interface is its parent
-        delete _app;
-        delete _conn;
-        delete _downInterface;
-        delete _shutDownTimer;
-    }
-
-    bool isTimeoutEnabled() {
-        return _isTimeoutEnabled;
-    }
-
-    void enableTimeout(bool enabled) {
-        _isTimeoutEnabled = enabled;
-        if (!_isTimeoutEnabled) {
-            _shutDownTimer->stop();
-        }
-    }
-
-    bool isStoppable() {
-        return _stoppable;
-    }
-
-    void setStoppable(bool stoppable) {
-        _stoppable = stoppable;
-    }
-
-    QList<QSslCertificate> selfSignedCerts() {
-        return _certs;
-    }
-
-    void setSelfSignedCerts(QList<QSslCertificate> certs) {
-        _certs = certs;
-    }
-
-    void start(QString path) {
-        TRACE;
-        _path = path;
-        _downAdaptor = new DownloadManagerAdaptor(_downInterface);
-        bool ret = _conn->registerService(_path);
-        if (ret) {
-            LOG(INFO) << "Service registered to"
-                << _path;
-            ret = _conn->registerObject("/", _downInterface);
-            if (!ret) {
-                LOG(ERROR) << "Could not register interface. DBus Error =>"
-                    << _conn->connection().lastError();
-                _app->exit(-1);
-            }
-            return;
-        }
-        LOG(ERROR) << "Could not register service. DBus Error =>"
-            << _conn->connection().lastError();
-        _app->exit(-1);
-    }
-
-    void stop() {
-        // stop listening in the service
-        bool ret = _conn->unregisterService(_path);
-        if (!ret) {
-            qCritical() << "Could not unregister service at" << _path;
-        }
-    }
-
-    Manager* manager() {
-        return _downInterface;
-    }
-
-    void onTimeout() {
-        LOG(INFO) << "Timeout reached, shutdown service.";
-        _app->exit(0);
-    }
-
-    void onDownloadManagerSizeChanged(int size) {
-        TRACE << size;
-        bool isActive = _shutDownTimer->isActive();
-
-        if (isActive && size > 0) {
-            LOG(INFO) << "Timer must be stopped because we have " << size
-                << "downloads.";
-            _shutDownTimer->stop();
-        }
-        if (!isActive && size == 0) {
-            LOG(INFO) << "Timer must be started because we have 0 downloads.";
-            _shutDownTimer->start(timeout);
-        }
-    }
-
-    static const int timeout = 30000;
-
- private:
-    void parseCommandLine() {
-        QStringList args = _app->arguments();
-        int index;
-
-        // set logging
-        if (args.contains(LOG_DIR)) {
-            index = args.indexOf(LOG_DIR);
-            if (args.count() > index + 1) {
-                auto logPath = args[index + 1];
-                Logger::setupLogging(logPath);
-                LOG(INFO) << "Log path is" << logPath;
-            } else {
-                Logger::setupLogging();
-                LOG(ERROR) << "Missing log dir path.";
-            }
-        } else {
-            Logger::setupLogging();
-            LOG(INFO) << "Using default log path.";
-        }
-
-        if (args.contains(SELFSIGNED_CERT)) {
-            index = args.indexOf(SELFSIGNED_CERT);
-            if (args.count() > index + 1) {
-                QString certsRegex = args[index + 1];
-                _certs = QSslCertificate::fromPath(certsRegex);
-                LOG(INFO) << "Accepting self signed certs at path"
-                    << certsRegex;
-            } else {
-                LOG(ERROR) << "Missing certs path.";
-            }
-        }  // certs
-        _isTimeoutEnabled = !args.contains(DISABLE_TIMEOUT);
-        LOG(INFO) << "Timeout is enabled: " << _isTimeoutEnabled;
-        _stoppable = args.contains(STOPPABLE);
-        LOG(INFO) << "Daemon is stoppable: " << _stoppable;
-    }
-
-    void init() {
-        Q_Q(Daemon);
-
-        // parse command line to decide if the timer is enabled and if
-        // we accept self signed certs
-        parseCommandLine();
-        if (_isTimeoutEnabled) {
-            q->connect(_shutDownTimer, SIGNAL(timeout()),
-                q, SLOT(onTimeout()));
-            _shutDownTimer->start(timeout);
-        }
-
-        if (_downInterface == nullptr) {
-            _downInterface = new Manager(_app, _conn, _stoppable,
-                q_ptr);
-        }
-
-        _downInterface->setAcceptedCertificates(_certs);
-        // connect to the download manager changes
-        q->connect(_downInterface,
-            SIGNAL(sizeChanged(int)),  // NOLINT (readability/function)
-            q, SLOT(onDownloadManagerSizeChanged(int))); // NOLINT (readability/function)
-    }
-
- private:
-    QString _path = "";
-    bool _isTimeoutEnabled = true;
-    bool _stoppable = false;
-    QList<QSslCertificate> _certs;
-    Application* _app = nullptr;
-    Timer* _shutDownTimer = nullptr;
-    DBusConnection* _conn = nullptr;
-    Manager* _downInterface = nullptr;
-    DownloadManagerAdaptor* _downAdaptor = nullptr;
-    Daemon* q_ptr;
-};
-
-/**
- * PUBLIC IMPLEMENTATION
- */
-
-Daemon::Daemon(QObject *parent)
+namespace Transfers {
+
+using namespace System;
+
+BaseDaemon::BaseDaemon(ManagerFactory* managerFactory,
+               AdaptorFactory* adaptorFactory,
+               QObject *parent)
     : QObject(parent),
-      d_ptr(new DaemonPrivate(this)) {
+      _managerFactory(managerFactory),
+      _adaptorFactory(adaptorFactory) {
+
+    _app = new Application();
+    _conn = new DBusConnection();
+    _shutDownTimer = new Timer();
+    init();
 }
 
-Daemon::Daemon(Application* app,
+BaseDaemon::BaseDaemon(ManagerFactory* managerFactory,
+               AdaptorFactory* adaptorFactory,
+               Application* app,
                DBusConnection* conn,
                Timer* timer,
-               Manager* man,
-               QObject *parent)
+               QObject* parent)
     : QObject(parent),
-      d_ptr(new DaemonPrivate(app, conn, timer, man, this)) {
-}
-
-Daemon::Daemon(ManagerConstructor manConstructor, QObject *parent)
-    : QObject(parent) {
-    auto app = new Application();
-    auto conn = new DBusConnection();
-    auto timer = new Timer();
-    auto man = manConstructor(app, conn);
-    qDebug() << man;
-    d_ptr = new DaemonPrivate(app, conn, timer, man, this);
-}
-
-Daemon::~Daemon() {
-    delete d_ptr;
-}
-
-bool
-Daemon::isTimeoutEnabled() {
-    Q_D(Daemon);
-    return d->isTimeoutEnabled();
-}
-
-void
-Daemon::enableTimeout(bool enabled) {
-    Q_D(Daemon);
-    d->enableTimeout(enabled);
-}
-
-bool
-Daemon::isStoppable() {
-    Q_D(Daemon);
-    return d->isStoppable();
-}
-
-void
-Daemon::setStoppable(bool stoppable) {
-    Q_D(Daemon);
-    d->setStoppable(stoppable);
+      _app(app),
+      _shutDownTimer(timer),
+      _conn(conn),
+      _managerFactory(managerFactory),
+      _adaptorFactory(adaptorFactory) {
+    init();
+}
+
+BaseDaemon::~BaseDaemon() {
+    // no need to delete the adaptor because the interface is its parent
+    delete _app;
+    delete _conn;
+    delete _manager;
+    delete _shutDownTimer;
+    delete _managerFactory;
+    delete _adaptorFactory;
+}
+
+bool
+BaseDaemon::isTimeoutEnabled() {
+    return _isTimeoutEnabled;
+}
+
+void
+BaseDaemon::enableTimeout(bool enabled) {
+    _isTimeoutEnabled = enabled;
+    if (!_isTimeoutEnabled) {
+        _shutDownTimer->stop();
+    }
+}
+
+bool
+BaseDaemon::isStoppable() {
+    return _stoppable;
+}
+
+void
+BaseDaemon::setStoppable(bool stoppable) {
+    _stoppable = stoppable;
 }
 
 QList<QSslCertificate>
-Daemon::selfSignedCerts() {
-    Q_D(Daemon);
-    return d->selfSignedCerts();
-}
-
-void
-Daemon::setSelfSignedCerts(QList<QSslCertificate> certs) {
-    Q_D(Daemon);
-    d->setSelfSignedCerts(certs);
-}
-
-void
-Daemon::start(QString path) {
-    Q_D(Daemon);
-    d->start(path);
-}
-
-void
-Daemon::stop() {
-    Q_D(Daemon);
-    d->stop();
-}
-
-Manager*
-Daemon::manager() {
-    Q_D(Daemon);
-    return d->manager();
-}
-
-}  // Daemon
-
-}  // DownloadManager
+BaseDaemon::selfSignedCerts() {
+    return _certs;
+}
+
+void
+BaseDaemon::setSelfSignedCerts(QList<QSslCertificate> certs) {
+    _certs = certs;
+}
+
+void
+BaseDaemon::start(const QString& path) {
+    TRACE;
+    _path = path;
+    _managerAdaptor = _adaptorFactory->createAdaptor(_manager);
+    bool ret = _conn->registerService(_path);
+    if (ret) {
+        LOG(INFO) << "Service registered to" << _path;
+        ret = _conn->registerObject("/", _manager);
+        if (!ret) {
+            LOG(ERROR) << "Could not register interface. DBus Error =>"
+                << _conn->connection().lastError();
+            _app->exit(-1);
+        }
+        return;
+    }
+    LOG(ERROR) << "Could not register service. DBus Error =>"
+        << _conn->connection().lastError();
+    _app->exit(-1);
+}
+
+void
+BaseDaemon::stop() {
+    // stop listening in the service
+    bool ret = _conn->unregisterService(_path);
+    if (!ret) {
+        qCritical() << "Could not unregister service at" << _path;
+    }
+}
+
+BaseManager*
+BaseDaemon::manager() {
+    return _manager;
+}
+
+void
+BaseDaemon::onTimeout() {
+    LOG(INFO) << "Timeout reached, shutdown service.";
+    _app->exit(0);
+}
+
+void
+BaseDaemon::onDownloadManagerSizeChanged(int size) {
+    TRACE << size;
+    bool isActive = _shutDownTimer->isActive();
+
+    if (isActive && size > 0) {
+        LOG(INFO) << "Timer must be stopped because we have " << size
+            << "downloads.";
+        _shutDownTimer->stop();
+    }
+    if (!isActive && size == 0) {
+        LOG(INFO) << "Timer must be started because we have 0 downloads.";
+        _shutDownTimer->start(DEFAULT_TIMEOUT);
+    }
+}
+
+void
+BaseDaemon::parseCommandLine() {
+    QStringList args = _app->arguments();
+    int index;
+
+    // set logging
+    if (args.contains(LOG_DIR)) {
+        index = args.indexOf(LOG_DIR);
+        if (args.count() > index + 1) {
+            auto logPath = args[index + 1];
+            Logger::setupLogging(logPath);
+            LOG(INFO) << "Log path is" << logPath;
+        } else {
+            LOG(ERROR) << "Missing log dir path.";
+            Logger::setupLogging();
+        }
+    } else {
+        Logger::setupLogging();
+    }
+
+    if (args.contains(SELFSIGNED_CERT)) {
+        index = args.indexOf(SELFSIGNED_CERT);
+        if (args.count() > index + 1) {
+            QString certsRegex = args[index + 1];
+            _certs = QSslCertificate::fromPath(certsRegex);
+            LOG(INFO) << "Accepting self signed certs at path"
+                << certsRegex;
+        } else {
+            LOG(ERROR) << "Missing certs path.";
+        }
+    }  // certs
+    _isTimeoutEnabled = !args.contains(DISABLE_TIMEOUT);
+    LOG(INFO) << "Timeout is enabled: " << _isTimeoutEnabled;
+    _stoppable = args.contains(STOPPABLE);
+    LOG(INFO) << "Daemon is stoppable: " << _stoppable;
+}
+
+void
+BaseDaemon::init() {
+    // parse command line to decide if the timer is enabled and if
+    // we accept self signed certs
+    parseCommandLine();
+    if (_isTimeoutEnabled) {
+        CHECK(connect(_shutDownTimer, &Timer::timeout,
+            this, &BaseDaemon::onTimeout))
+                << "Could not connect to signal";
+        _shutDownTimer->start(DEFAULT_TIMEOUT);
+    }
+
+    _manager = _managerFactory->createManager(
+        _app, _conn, _stoppable, this);
+
+    _manager->setAcceptedCertificates(_certs);
+    // connect to the download manager changes
+    CHECK(connect(_manager,
+        &BaseManager::sizeChanged,
+        this, &BaseDaemon::onDownloadManagerSizeChanged))
+                << "Could not connect to signal";
+}
+
+}  // General
 
 }  // Ubuntu
-
-#include "moc_daemon.cpp"

=== renamed file 'ubuntu-download-manager-priv/downloads/daemon.h' => 'src/common/priv/ubuntu/transfers/base_daemon.h'
--- ubuntu-download-manager-priv/downloads/daemon.h	2014-02-07 10:06:24 +0000
+++ src/common/priv/ubuntu/transfers/base_daemon.h	2014-04-11 16:06:36 +0000
@@ -16,19 +16,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef DOWNLOADER_LIB_DOWNLOAD_DAEMON_H
-#define DOWNLOADER_LIB_DOWNLOAD_DAEMON_H
+#ifndef UBUNTU_GENERAL_LIB_DAEMON_H
+#define UBUNTU_GENERAL_LIB_DAEMON_H
 
 #include <functional>
 #include <QObject>
-#include <QSslCertificate>
 #include <QSharedPointer>
-#include <ubuntu/download_manager/common.h>
-#include <ubuntu/download_manager/system/dbus_connection.h>
+#include <ubuntu/transfers/system/dbus_connection.h>
+
+class QSslCertificate;
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -38,26 +38,27 @@
 
 }
 
-namespace Daemon {
-
-class Manager;
-class DaemonPrivate;
-
-typedef std::function<Manager*(System::Application*, System::DBusConnection*)>
+class BaseManager;
+class ManagerFactory;
+class AdaptorFactory;
+
+typedef std::function<BaseManager*(System::Application*, System::DBusConnection*)>
     ManagerConstructor;
 
-class DOWNLOAD_MANAGER_EXPORT Daemon : public QObject {
-    Q_DECLARE_PRIVATE(Daemon)
+class BaseDaemon : public QObject {
     Q_OBJECT
 
  public:
-    explicit Daemon(QObject *parent = 0);
-    Daemon(System::Application* app,
+    BaseDaemon(ManagerFactory* managerFactory,
+           AdaptorFactory* adaptorFactory,
+           QObject *parent = 0);
+    BaseDaemon(ManagerFactory* managerFactory,
+           AdaptorFactory* adaptorFactory,
+           System::Application* app,
            System::DBusConnection* conn,
            System::Timer* timer,
-           Manager* man,
            QObject *parent = 0);
-    virtual ~Daemon();
+    virtual ~BaseDaemon();
 
     bool isTimeoutEnabled();
     void enableTimeout(bool enabled);
@@ -69,28 +70,34 @@
     void setSelfSignedCerts(QList<QSslCertificate> cert);
 
  public slots:  // NOLINT (whitespace/indent)
-    virtual void start(QString path="com.canonical.applications.Downloader");
+    virtual void start(const QString& path);
     void stop();
 
  protected:
-    // constructor that can be used to pass a special case of manager
-    // this is useful when a subclass was to speciallize the manager
-    Daemon(ManagerConstructor manConstructor, QObject* parent = 0);
-
-    Manager* manager();
-
- private:
-    Q_PRIVATE_SLOT(d_func(), void onTimeout())
-    Q_PRIVATE_SLOT(d_func(), void onDownloadManagerSizeChanged(int))  // NOLINT (readability/function)
-
- private:
-    // use pimpl so that we can mantains ABI compatibility
-    DaemonPrivate* d_ptr;
+    BaseManager* manager();
+
+ private:
+    void init();
+    void parseCommandLine();
+    void onTimeout();
+    void onDownloadManagerSizeChanged(int);
+
+ private:
+    QString _path = "";
+    bool _isTimeoutEnabled = true;
+    bool _stoppable = false;
+    QList<QSslCertificate> _certs;
+    System::Application* _app = nullptr;
+    System::Timer* _shutDownTimer = nullptr;
+    System::DBusConnection* _conn = nullptr;
+    ManagerFactory* _managerFactory = nullptr;
+    AdaptorFactory* _adaptorFactory = nullptr;
+    BaseManager* _manager = nullptr;
+    QObject* _managerAdaptor = nullptr;
 };
 
-}  // Daemon
-
-}  // DownloadManager
+}  // General
 
 }  // Ubuntu
+
 #endif  // DOWNLOADER_LIB_DOWNLOAD_DAEMON_H

=== added file 'src/common/priv/ubuntu/transfers/base_manager.cpp'
--- src/common/priv/ubuntu/transfers/base_manager.cpp	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/base_manager.cpp	2014-04-11 16:06:36 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "base_manager.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+BaseManager::BaseManager(System::Application* app,
+                         bool stoppable,
+                         QObject *parent)
+    : QObject(parent),
+      QDBusContext(),
+      _app(app),
+      _stoppable(stoppable) {
+}
+
+void
+BaseManager::exit() {
+    if (_stoppable) {
+        _app->exit(0);
+    } else {
+        if (calledFromDBus()) {
+            sendErrorReply(QDBusError::NotSupported,
+                "Daemon should have been started with -stoppable");
+        }  // dbus call
+    }
+}
+
+}  // General
+
+}  // Ubuntu

=== added file 'src/common/priv/ubuntu/transfers/base_manager.h'
--- src/common/priv/ubuntu/transfers/base_manager.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/base_manager.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_GENERAL_MANAGER_H
+#define UBUNTU_GENERAL_MANAGER_H
+
+#include <QDBusContext>
+#include <QList>
+#include <QObject>
+#include <QSslCertificate>
+#include "ubuntu/transfers/system/application.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+using namespace System;
+
+class BaseManager : public QObject, public QDBusContext {
+    Q_OBJECT
+
+ public:
+    BaseManager(Application* app,
+                bool stopabble=false,
+                QObject *parent = 0);
+
+    virtual QList<QSslCertificate> acceptedCertificates() = 0;
+    virtual void setAcceptedCertificates(
+        const QList<QSslCertificate>& certs) = 0;
+
+    virtual void exit();
+
+ signals:
+    void sizeChanged(int count);
+
+ protected:
+    Application* _app = nullptr;
+    bool _stoppable = false;
+};
+
+}  // General
+
+}  // Ubuntu
+
+#endif // UBUNTU_GENERAL_MANAGER_H

=== added file 'src/common/priv/ubuntu/transfers/manager_factory.h'
--- src/common/priv/ubuntu/transfers/manager_factory.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/manager_factory.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_GENERAL_MANAGER_FACTORY_H
+#define UBUNTU_GENERAL_MANAGER_FACTORY_H
+
+#include <ubuntu/transfers/system/dbus_connection.h>
+#include "ubuntu/transfers/system/application.h"
+#include "base_manager.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+class ManagerFactory : public QObject {
+ public:
+    explicit ManagerFactory(QObject *parent = 0)
+        : QObject(parent) {}
+
+    virtual BaseManager* createManager(Application* app,
+                                   DBusConnection* connection,
+                                   bool stoppable = false,
+                                   QObject *parent = 0) = 0;
+};
+
+}  // General
+
+}  // Ubuntu
+
+#endif  // UBUNTU_GENERAL_MANAGER_FACTORY_H
+

=== renamed file 'ubuntu-download-manager-priv/downloads/queue.cpp' => 'src/common/priv/ubuntu/transfers/queue.cpp'
--- ubuntu-download-manager-priv/downloads/queue.cpp	2014-02-03 17:52:16 +0000
+++ src/common/priv/ubuntu/transfers/queue.cpp	2014-04-11 16:06:36 +0000
@@ -17,58 +17,60 @@
  */
 
 #include <QSignalMapper>
-#include "downloads/queue.h"
-#include "system/logger.h"
-#include "system/system_network_info.h"
+#include <glog/logging.h>
+#include "ubuntu/transfers/system/logger.h"
+#include "ubuntu/transfers/system/system_network_info.h"
+#include "queue.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
-
-namespace Daemon {
+namespace Transfers {
 
 Queue::Queue(QObject* parent)
     : QObject(parent),
       _current("") {
-    connect(SystemNetworkInfo::instance(),
+    CHECK(connect(SystemNetworkInfo::instance(),
         &SystemNetworkInfo::currentNetworkModeChanged,
-        this, &Queue::onCurrentNetworkModeChanged);
+        this, &Queue::onCurrentNetworkModeChanged))
+            << "Could not connect to signal";
 }
 
 void
-Queue::add(Download* download) {
+Queue::add(Transfer* transfer) {
     // connect to the signals and append to the list
-    QString path = download->path();
+    auto path = transfer->path();
     TRACE << path;
 
     _sortedPaths.append(path);
-    _downloads[path] = download;
+    _transfers[path] = transfer;
 
-    if (download->addToQueue()) {
-        connect(download, &Download::stateChanged,
-            this, &Queue::onManagedDownloadStateChanged);
+    if (transfer->addToQueue()) {
+        CHECK(connect(transfer, &Transfer::stateChanged,
+            this, &Queue::onManagedTransferStateChanged))
+                << "Could not connect to signal";
     } else {
-        connect(download, &Download::stateChanged,
-            this, &Queue::onUnmanagedDownloadStateChanged);
+        CHECK(connect(transfer, &Transfer::stateChanged,
+            this, &Queue::onUnmanagedTransferStateChanged))
+                << "Could not connect to signal";
     }
 
-    emit downloadAdded(path);
+    emit transferAdded(path);
 }
 
 void
 Queue::remove(const QString& path) {
     TRACE << path;
 
-    Download* down = _downloads[path];
+    auto transfer = _transfers[path];
     _sortedPaths.removeOne(path);
-    _downloads.remove(path);
+    _transfers.remove(path);
 
-    down->deleteLater();
-    emit downloadRemoved(path);
+    transfer->deleteLater();
+    emit transferRemoved(path);
 }
 
 QString
-Queue::currentDownload() {
+Queue::currentTransfer() {
     return _current;
 }
 
@@ -77,56 +79,60 @@
     return _sortedPaths;
 }
 
-QHash<QString, Download*>
-Queue::downloads() {
-    QHash<QString, Download*> downloads;
+QHash<QString, Transfer*>
+Queue::transfers() {
+    QHash<QString, Transfer*> transfers;
     foreach(const QString& path, _sortedPaths) {
-        downloads[path] = _downloads[path];
+        transfers[path] = _transfers[path];
     }
-    return downloads;
+    return transfers;
 }
 
 int
 Queue::size() {
-    return _downloads.size();
+    return _transfers.size();
 }
 
 void
-Queue::onManagedDownloadStateChanged() {
+Queue::onManagedTransferStateChanged() {
     TRACE;
     // get the appdownload that emited the signal and
     // decide what to do with it
-    Download* down = qobject_cast<Download*>(sender());
-    switch (down->state()) {
-        case Download::START:
-            // only start the download in the update method
-            if (_current.isEmpty())
-                updateCurrentDownload();
-            break;
-        case Download::PAUSE:
-            down->pauseDownload();
-            if (!_current.isEmpty()  && _current == down->path())
-                updateCurrentDownload();
-            break;
-        case Download::RESUME:
-            // only resume the download in the update method
-            if (_current.isEmpty())
-                updateCurrentDownload();
-            break;
-        case Download::CANCEL:
-            // cancel and remove the download
-            down->cancelDownload();
-            if (!_current.isEmpty() && _current == down->path())
-                updateCurrentDownload();
+    auto transfer = qobject_cast<Transfer*>(sender());
+    qDebug() << "State changed" << transfer;
+    switch (transfer->state()) {
+        case Transfer::START:
+            // only start the transfer in the update method
+            if (_current.isEmpty())
+                updateCurrentTransfer();
+            break;
+        case Transfer::PAUSE:
+            transfer->pauseTransfer();
+            if (!_current.isEmpty()  && _current == transfer->path())
+                updateCurrentTransfer();
+            break;
+        case Transfer::RESUME:
+            // only resume the transfer in the update method
+            qDebug() << "State changed to resume.";
+            if (_current.isEmpty()) {
+                qDebug() << "There is no current download present.";
+                updateCurrentTransfer();
+            }
+            break;
+        case Transfer::CANCEL:
+            // cancel and remove the transfer
+            transfer->cancelTransfer();
+            if (!_current.isEmpty() && _current == transfer->path())
+                updateCurrentTransfer();
             else
-                remove(down->path());
+                remove(transfer->path());
             break;
-        case Download::ERROR:
-        case Download::FINISH:
-            // remove the registered object in dbus, remove the download
+        case Transfer::ERROR:
+        case Transfer::FINISH:
+            // remove the registered object in dbus, remove the transfer
             // and the adapter from the list
-            if (!_current.isEmpty() && _current == down->path())
-                updateCurrentDownload();
+            if (!_current.isEmpty() && _current == transfer->path())
+                updateCurrentTransfer();
             break;
         default:
             // do nothing
@@ -135,17 +141,17 @@
 }
 
 void
-Queue::onUnmanagedDownloadStateChanged() {
+Queue::onUnmanagedTransferStateChanged() {
     TRACE;
-    // grab the download and clean it when needed
-    Download* down = qobject_cast<Download*>(sender());
-    switch (down->state()) {
-        case Download::CANCEL:
-        case Download::ERROR:
-        case Download::FINISH:
-            // remove the registered object in dbus, remove the download
+    // grab the transfer and clean it when needed
+    auto transfer = qobject_cast<Transfer*>(sender());
+    switch (transfer->state()) {
+        case Transfer::CANCEL:
+        case Transfer::ERROR:
+        case Transfer::FINISH:
+            // remove the registered object in dbus, remove the transfer
             // and the adapter from the list
-            remove(down->path());
+            remove(transfer->path());
             break;
         default:
             // do nothing
@@ -157,44 +163,45 @@
 Queue::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
     TRACE << mode;
     if (mode != QNetworkInfo::UnknownMode) {
-        updateCurrentDownload();
+        updateCurrentTransfer();
     }
 }
 
 void
-Queue::updateCurrentDownload() {
+Queue::updateCurrentTransfer() {
     TRACE;
     if (!_current.isEmpty()) {
         // check if it was canceled/finished
-        Download* currentDownload = _downloads[_current];
-        Download::State state = currentDownload->state();
-        if (state == Download::CANCEL || state == Download::FINISH
-            || state == Download::ERROR) {
+        auto currentTransfer = _transfers[_current];
+        auto state = currentTransfer->state();
+        if (state == Transfer::CANCEL || state == Transfer::FINISH
+            || state == Transfer::ERROR) {
             LOG(INFO) << "State is CANCEL || FINISH || ERROR";
             remove(_current);
             _current = "";
-        } else if (!currentDownload->canDownload()
-                || state == Download::PAUSE) {
-            LOG(INFO) << "States is Cannot Download || PAUSE";
+        } else if (!currentTransfer->canTransfer()
+                || state == Transfer::PAUSE) {
+            LOG(INFO) << "States is Cannot Transfer || PAUSE";
             _current = "";
         } else {
             return;
         }
     }
 
-    // loop via the downloads and choose the first that is
+    // loop via the transfers and choose the first that is
     // started or resumed
     foreach(const QString& path, _sortedPaths) {
-        Download* down = _downloads[path];
-        Download::State state = down->state();
-        if (down->canDownload()
-                && (state == Download::START
-                    || state == Download::RESUME)) {
+        auto transfer = _transfers[path];
+        auto state = transfer->state();
+        if (transfer->canTransfer()
+                && (state == Transfer::START
+                    || state == Transfer::RESUME)) {
             _current = path;
-            if (state == Download::START)
-                down->startDownload();
+            qDebug() << _current;
+            if (state == Transfer::START)
+                transfer->startTransfer();
             else
-                down->resumeDownload();
+                transfer->resumeTransfer();
             break;
         }
     }
@@ -202,8 +209,6 @@
     emit currentChanged(_current);
 }
 
-}  // Daemon
-
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-priv/downloads/queue.h' => 'src/common/priv/ubuntu/transfers/queue.h'
--- ubuntu-download-manager-priv/downloads/queue.h	2014-01-29 10:47:13 +0000
+++ src/common/priv/ubuntu/transfers/queue.h	2014-04-11 16:06:36 +0000
@@ -19,56 +19,53 @@
 #ifndef DOWNLOADER_LIB_DOWNLOAD_QUEUE_H
 #define DOWNLOADER_LIB_DOWNLOAD_QUEUE_H
 
+#include <QString>
+#include <QStringList>
 #include <QList>
 #include <QPair>
 #include <QSharedPointer>
-#include "downloads/download.h"
-#include "downloads/download_adaptor.h"
+#include "transfer.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 using namespace System;
 
-namespace Daemon {
-
 class Queue : public QObject {
     Q_OBJECT
 
  public:
     explicit Queue(QObject* parent = 0);
 
-    virtual void add(Download* download);
+    virtual void add(Transfer* transfer);
 
     // accessors for useful info
-    QString currentDownload();
-    QStringList paths();
-    QHash<QString, Download*> downloads();
+    virtual QString currentTransfer();
+    virtual QStringList paths();
+    virtual QHash<QString, Transfer*> transfers();
     virtual int size();
 
  signals:
     // signals raised when things happens within the q
     void currentChanged(QString path);
-    void downloadAdded(QString path);
-    void downloadRemoved(QString path);
+    void transferAdded(QString path);
+    void transferRemoved(QString path);
 
  private:
-    void onManagedDownloadStateChanged();
-    void onUnmanagedDownloadStateChanged();
+    void onManagedTransferStateChanged();
+    void onUnmanagedTransferStateChanged();
     void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
     void remove(const QString& path);
-    void updateCurrentDownload();
+    void updateCurrentTransfer();
 
  private:
     QString _current;
-    QHash<QString, Download*> _downloads;  // quick for access
+    QHash<QString, Transfer*> _transfers;  // quick for access
     QStringList _sortedPaths;  // keep the order
 };
 
-}  // Daemon
-
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== renamed directory 'ubuntu-download-manager-priv/system' => 'src/common/priv/ubuntu/transfers/system'
=== modified file 'src/common/priv/ubuntu/transfers/system/apn_proxy.cpp'
--- ubuntu-download-manager-priv/system/apn_proxy.cpp	2014-01-28 18:51:12 +0000
+++ src/common/priv/ubuntu/transfers/system/apn_proxy.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -34,8 +34,8 @@
     return proxy;
 }
 
-}
-
-}
-
-}
+}  // System
+
+}  // Transfers
+
+}  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/apn_proxy.h'
--- ubuntu-download-manager-priv/system/apn_proxy.h	2014-01-28 18:51:12 +0000
+++ src/common/priv/ubuntu/transfers/system/apn_proxy.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -38,9 +38,9 @@
 
 };
 
-} //  System
+}  //  System
 
-}  // DownloadManager
+}  // Transfers 
 
 }  // Ubuntu
 #endif // APN_PROXY_H

=== modified file 'src/common/priv/ubuntu/transfers/system/apn_request_factory.cpp'
--- ubuntu-download-manager-priv/system/apn_request_factory.cpp	2014-01-29 12:11:35 +0000
+++ src/common/priv/ubuntu/transfers/system/apn_request_factory.cpp	2014-04-11 16:06:36 +0000
@@ -21,7 +21,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -34,6 +34,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/apn_request_factory.h'
--- ubuntu-download-manager-priv/system/apn_request_factory.h	2014-01-29 12:11:35 +0000
+++ src/common/priv/ubuntu/transfers/system/apn_request_factory.h	2014-04-11 16:06:36 +0000
@@ -25,7 +25,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -40,7 +40,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/apparmor.cpp'
--- ubuntu-download-manager-priv/system/apparmor.cpp	2014-02-01 09:01:47 +0000
+++ src/common/priv/ubuntu/transfers/system/apparmor.cpp	2014-04-11 16:06:36 +0000
@@ -25,13 +25,13 @@
 #include <QDir>
 #include <QRegExp>
 #include <QStandardPaths>
+#include <ubuntu/transfers/system/logger.h>
 #include "uuid_utils.h"
-#include "logger.h"
 #include "apparmor.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -57,67 +57,30 @@
     delete _uuidFactory;
 }
 
-void
-AppArmor::getDBusPath(QString& id, QString& dbusPath) {
-    QUuid uuid = _uuidFactory->createUuid();
-    id = UuidUtils::getDBusString(uuid);
-    dbusPath = UuidUtils::getDBusString(uuid);
-}
-
-QString
-AppArmor::getSecurePath(const QString& connName,
-                    QString& dbusPath,
-                    QString& localPath,
-                    bool& isConfined) {
-    QString id = UuidUtils::getDBusString(_uuidFactory->createUuid());
-    getSecurePath(connName, id, dbusPath, localPath, isConfined);
-    return id;
-}
-
-QString
-AppArmor::getLocalPath(const QString& appId) {
-    // if the service is running as root we will always return /tmp
-    // as the local path root
-    if (getuid() == 0){
-        LOG(INFO) << "Running as system bus using /tmp for downloads";
-        return QStandardPaths::writableLocation(
-            QStandardPaths::TempLocation);
-    } else {
-        QString dataPath = QStandardPaths::writableLocation(
-            QStandardPaths::DataLocation);
-        QStringList pathComponents;
-        pathComponents << dataPath;
-
-        if (!appId.isEmpty()) {
-            QStringList appIdInfo = appId.split("_");
-            if (appIdInfo.count() > 0)
-                pathComponents << appIdInfo[0];
-        }
-
-        pathComponents << "Downloads";
-
-        QString path = pathComponents.join(QDir::separator());
-
-        bool wasCreated = QDir().mkpath(path);
-        if (!wasCreated) {
-            LOG(ERROR) << "Could not create the data path"
-                << path;
-        }
-        LOG(INFO) << "Local path is" << path;
-        return path;
-    }  // not root
-}
-
-void
-AppArmor::getSecurePath(const QString& connName,
-                   const QString& id,
-                   QString& dbusPath,
-                   QString& localPath,
-                   bool& isConfined) {
+SecurityDetails*
+AppArmor::getSecurityDetails(const QString& connName) {
+    auto id = UuidUtils::getDBusString(_uuidFactory->createUuid());
+    auto details = new SecurityDetails(id);
+    getSecurityDetails(connName, details);
+    return details;
+}
+
+SecurityDetails*
+AppArmor::getSecurityDetails(const QString& connName,
+                             const QString& id) {
+
+    auto details = new SecurityDetails(id);
+    getSecurityDetails(connName, details);
+    return details;
+}
+
+void
+AppArmor::getSecurityDetails(const QString& connName,
+                             SecurityDetails* details) {
     if (connName.isEmpty()) {
-        dbusPath = QString(BASE_ACCOUNT_URL) + "/" + id;
-        localPath = getLocalPath("");
-        isConfined = false;
+        details->dbusPath = QString(BASE_ACCOUNT_URL) + "/" + details->id;
+        details->localPath = getLocalPath("");
+        details->isConfined = false;
         return;
     }
 
@@ -127,9 +90,9 @@
     reply.waitForFinished();
     if (reply.isError()) {
         LOG(ERROR) << reply.error(); 
-        dbusPath = QString(BASE_ACCOUNT_URL) + "/" + id;
-        localPath = getLocalPath("");
-        isConfined = false;
+        details->dbusPath = QString(BASE_ACCOUNT_URL) + "/" + details->id;
+        details->localPath = getLocalPath("");
+        details->isConfined = false;
         return;
     } else {
         // use the returned value
@@ -137,12 +100,12 @@
 
         if (appId.isEmpty() || appId == UNCONFINED_ID) {
             LOG(INFO) << "UNCONFINED APP";
-            dbusPath = QString(BASE_ACCOUNT_URL) + "/" + id;
-            localPath = getLocalPath("");
-            isConfined = false;
+            details->dbusPath = QString(BASE_ACCOUNT_URL) + "/" + details->id;
+            details->localPath = getLocalPath("");
+            details->isConfined = false;
             return;
         } else {
-            isConfined = true;
+            details->isConfined = true;
             QByteArray appIdBa = appId.toUtf8();
 
             char * appIdPath;
@@ -152,8 +115,8 @@
             if (appIdPath == nullptr) {
                 LOG(ERROR) << "Unable to allocate memory for "
                     << "nih_dbus_path()";
-                dbusPath = QString(BASE_ACCOUNT_URL) + "/" + id;
-                localPath = getLocalPath(appId);
+                details->dbusPath = QString(BASE_ACCOUNT_URL) + "/" + details->id;
+                details->localPath = getLocalPath(appId);
                 return;
             }
             QString path = QString(appIdPath);
@@ -161,15 +124,57 @@
 
             // free nih data
             nih_free(appIdPath);
-            dbusPath = path + "/" + id;
-            localPath = getLocalPath(appId);
+            details->dbusPath = path + "/" + details->id;
+            details->localPath = getLocalPath(appId);
             return;
         }  // not empty appid string
     }  // no dbus error
 }
 
+QPair<QString, QString>
+AppArmor::getDBusPath() {
+    QUuid uuid = _uuidFactory->createUuid();
+    QString id = UuidUtils::getDBusString(uuid);
+    QString dbusPath = UuidUtils::getDBusString(uuid);
+    return QPair<QString, QString>(id, dbusPath);
+}
+
+QString
+AppArmor::getLocalPath(const QString& appId) {
+    // if the service is running as root we will always return /tmp
+    // as the local path root
+    if (getuid() == 0){
+        LOG(INFO) << "Running as system bus using /tmp for downloads";
+        return QStandardPaths::writableLocation(
+            QStandardPaths::TempLocation);
+    } else {
+        QString dataPath = QStandardPaths::writableLocation(
+            QStandardPaths::DataLocation);
+        QStringList pathComponents;
+        pathComponents << dataPath;
+
+        if (!appId.isEmpty()) {
+            QStringList appIdInfo = appId.split("_");
+            if (appIdInfo.count() > 0)
+                pathComponents << appIdInfo[0];
+        }
+
+        pathComponents << "Downloads";
+
+        QString path = pathComponents.join(QDir::separator());
+
+        bool wasCreated = QDir().mkpath(path);
+        if (!wasCreated) {
+            LOG(ERROR) << "Could not create the data path"
+                << path;
+        }
+        LOG(INFO) << "Local path is" << path;
+        return path;
+    }  // not root
+}
+
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/apparmor.h'
--- ubuntu-download-manager-priv/system/apparmor.h	2014-01-10 16:38:56 +0000
+++ src/common/priv/ubuntu/transfers/system/apparmor.h	2014-04-11 16:06:36 +0000
@@ -23,17 +23,27 @@
 #include <QPair>
 #include <QString>
 #include <QSharedPointer>
-#include <ubuntu/download_manager/system/dbus_connection.h>
+#include <ubuntu/transfers/system/dbus_connection.h>
 #include "dbus_proxy.h"
 #include "uuid_factory.h"
 
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
+struct SecurityDetails {
+ public:
+    SecurityDetails() = default;
+    SecurityDetails(const QString& requiredId) { id = requiredId; }
+    QString id;
+    QString dbusPath;
+    QString localPath;
+    bool isConfined = false;
+};
+
 class AppArmor : public QObject {
     Q_OBJECT
 
@@ -42,18 +52,15 @@
     AppArmor(QSharedPointer<DBusConnection> connection, QObject *parent = 0);
     ~AppArmor();
 
-    virtual void getDBusPath(QString& id, QString& dbusPath);
-
-    virtual QString getSecurePath(const QString& connName,
-                                QString& dbusPath,
-                                QString& localPath,
-                                bool& isConfined);
-    virtual void getSecurePath(const QString& connName,
-                               const QString& id,
-                               QString& dbusPath,
-                               QString& localPath,
-                               bool& isConfined);
+    virtual QPair<QString, QString> getDBusPath();
+
+    virtual SecurityDetails* getSecurityDetails(const QString& connName);
+    virtual SecurityDetails* getSecurityDetails(const QString& connName,
+                                                const QString& id);
+
  private:
+    void getSecurityDetails(const QString& connName,
+                            SecurityDetails* details);
     QString getLocalPath(const QString& appId);
 
  private:
@@ -66,7 +73,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/application.cpp'
--- ubuntu-download-manager-priv/system/application.cpp	2014-01-20 16:54:58 +0000
+++ src/common/priv/ubuntu/transfers/system/application.cpp	2014-04-11 16:06:36 +0000
@@ -21,11 +21,10 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
-
 Application::Application(QObject* parent)
     : QObject(parent) {
 }
@@ -44,6 +43,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/application.h'
--- ubuntu-download-manager-priv/system/application.h	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/application.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -40,7 +40,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== added file 'src/common/priv/ubuntu/transfers/system/cryptographic_hash.cpp'
--- src/common/priv/ubuntu/transfers/system/cryptographic_hash.cpp	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/cryptographic_hash.cpp	2014-04-11 16:06:36 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "cryptographic_hash.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace System {
+
+CryptographicHashFactory* CryptographicHashFactory::_instance = nullptr;
+QMutex CryptographicHashFactory::_mutex;
+
+CryptographicHash::CryptographicHash(QCryptographicHash::Algorithm method,
+                                     QObject* parent)
+    : QObject(parent),
+      _hash(method) {
+}
+
+
+bool
+CryptographicHash::addData(QIODevice * device) {
+    return _hash.addData(device);
+}
+
+QByteArray
+CryptographicHash::result() const {
+    return _hash.result();
+}
+
+
+CryptographicHashFactory::CryptographicHashFactory(QObject* parent)
+    : QObject(parent) {
+}
+
+CryptographicHash*
+CryptographicHashFactory::createCryptographicHash(
+                                       QCryptographicHash::Algorithm method,
+                                       QObject* parent) {
+    return new CryptographicHash(method, parent);
+}
+
+CryptographicHashFactory*
+CryptographicHashFactory::instance() {
+    if(_instance == nullptr) {
+        _mutex.lock();
+        if(_instance == nullptr)
+            _instance = new CryptographicHashFactory();
+        _mutex.unlock();
+    }
+    return _instance;
+}
+
+// only used for testing purposes
+void
+CryptographicHashFactory::setInstance(CryptographicHashFactory* instance) {
+    _instance = instance;
+}
+
+void
+CryptographicHashFactory::deleteInstance() {
+    if(_instance != nullptr) {
+        _mutex.lock();
+        if(_instance != nullptr) {
+            delete _instance;
+            _instance = nullptr;
+        }
+        _mutex.unlock();
+    }
+}
+
+}  // System
+
+}  // Transfers
+
+}  // Ubuntu

=== added file 'src/common/priv/ubuntu/transfers/system/cryptographic_hash.h'
--- src/common/priv/ubuntu/transfers/system/cryptographic_hash.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/system/cryptographic_hash.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DOWNLOADER_LIB_CRYPTOGRAPHIC_HASH_H
+#define DOWNLOADER_LIB_CRYPTOGRAPHIC_HASH_H
+
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QMutex>
+#include <QIODevice>
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+namespace System {
+
+class CryptographicHash : public QObject {
+
+ public:
+    CryptographicHash(QCryptographicHash::Algorithm method,
+                      QObject* parent = 0);
+    virtual bool addData(QIODevice* device);
+    virtual QByteArray result() const;
+
+ private:
+    QCryptographicHash _hash;
+};
+
+class CryptographicHashFactory : public QObject {
+
+ public:
+    explicit CryptographicHashFactory(QObject* parent = 0);
+    virtual CryptographicHash* createCryptographicHash(
+                                       QCryptographicHash::Algorithm method,
+                                       QObject* parent = 0);
+
+    static CryptographicHashFactory* instance();
+
+    // only used for testing purposes
+    static void setInstance(CryptographicHashFactory* instance);
+    static void deleteInstance();
+
+ private:
+    static CryptographicHashFactory* _instance;
+    static QMutex _mutex;
+
+};
+
+}  // System
+
+}  // Transfers
+
+}  // Ubuntu
+
+#endif

=== modified file 'src/common/priv/ubuntu/transfers/system/dbus_proxy.h'
--- ubuntu-download-manager-priv/system/dbus_proxy.h	2013-11-12 12:30:18 +0000
+++ src/common/priv/ubuntu/transfers/system/dbus_proxy.h	2014-04-11 16:06:36 +0000
@@ -19,7 +19,8 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtDBus/QtDBus>
-#include <ubuntu/download_manager/metatypes.h>
+
+typedef QMap<QString, QString> StringMap;
 
 /*
  * Proxy class for interface org.freedesktop.DBus

=== modified file 'src/common/priv/ubuntu/transfers/system/file_manager.cpp'
--- ubuntu-download-manager-priv/system/file_manager.cpp	2014-02-18 18:43:25 +0000
+++ src/common/priv/ubuntu/transfers/system/file_manager.cpp	2014-04-11 16:06:36 +0000
@@ -17,11 +17,12 @@
  */
 
 #include <QFile>
+#include <QTemporaryFile>
 #include "file_manager.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -29,6 +30,10 @@
     _file = new QFile(name);
 }
 
+File::File(QFile* file)
+    : _file(file) {
+}
+
 File::~File() {
     delete _file;
 }
@@ -97,6 +102,16 @@
     return new File(name);
 }
 
+File*
+FileManager::copyToTempFile(const QString& name) {
+    // create a temp file, and copy the old name to the
+    // new file path
+    auto tempFile = new QTemporaryFile();
+    QFile file(name);
+    file.copy(tempFile->fileName());
+    return new File(tempFile);
+}
+
 bool
 FileManager::remove(const QString& path) {
     return QFile::remove(path);
@@ -139,6 +154,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/file_manager.h'
--- ubuntu-download-manager-priv/system/file_manager.h	2014-02-18 18:43:25 +0000
+++ src/common/priv/ubuntu/transfers/system/file_manager.h	2014-04-11 16:06:36 +0000
@@ -26,7 +26,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -39,20 +39,21 @@
     virtual ~File();
 
     // wrappers around the used QFile methods
-    void close();
+    virtual void close();
     virtual QFile::FileError error() const;  // virtual for testing purposes
-    QString fileName() const;
+    virtual QString fileName() const;
     virtual bool flush();  // virtual for testing purposes
-    bool open(QIODevice::OpenMode mode);
-    QByteArray readAll();
-    bool remove();
-    bool reset();
-    qint64 size() const;
-    qint64 write(const QByteArray& byteArray);
-    QIODevice* device();
+    virtual bool open(QIODevice::OpenMode mode);
+    virtual QByteArray readAll();
+    virtual bool remove();
+    virtual bool reset();
+    virtual qint64 size() const;
+    virtual qint64 write(const QByteArray& byteArray);
+    virtual QIODevice* device();
 
  protected:
     explicit File(const QString& name);
+    explicit File(QFile* file);
 
  private:
     QFile* _file = nullptr;
@@ -64,6 +65,7 @@
 
  public:
     virtual File* createFile(const QString& name);
+    virtual File* copyToTempFile(const QString& name);
     virtual bool remove(const QString& path);
     virtual bool exists(const QString& path);
     virtual bool rename(const QString& oldName, const QString& newName);
@@ -86,7 +88,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/filename_mutex.cpp'
--- ubuntu-download-manager-priv/system/filename_mutex.cpp	2014-03-03 17:07:20 +0000
+++ src/common/priv/ubuntu/transfers/system/filename_mutex.cpp	2014-04-11 16:06:36 +0000
@@ -18,13 +18,13 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <ubuntu/download_manager/metadata.h>
-#include "logger.h"
+#include <ubuntu/transfers/metadata.h>
+#include <ubuntu/transfers/system/logger.h>
 #include "filename_mutex.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -128,6 +128,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/filename_mutex.h'
--- ubuntu-download-manager-priv/system/filename_mutex.h	2014-02-22 10:41:59 +0000
+++ src/common/priv/ubuntu/transfers/system/filename_mutex.h	2014-04-11 16:06:36 +0000
@@ -26,7 +26,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -57,7 +57,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/network_reply.cpp'
--- ubuntu-download-manager-priv/system/network_reply.cpp	2014-03-18 11:22:26 +0000
+++ src/common/priv/ubuntu/transfers/system/network_reply.cpp	2014-04-11 16:06:36 +0000
@@ -16,12 +16,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <ubuntu/transfers/system/logger.h>
+#include <glog/logging.h>
 #include "network_reply.h"
-#include "logger.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -30,16 +31,23 @@
       _reply(reply) {
     // connect to all the signals so that we forward them
     if (_reply != nullptr) {
-        connect(_reply, &QNetworkReply::downloadProgress,
-            this, &NetworkReply::downloadProgress);
-        connect(_reply, &QNetworkReply::finished,
-            this, &NetworkReply::finished);
-        connect(_reply, &QNetworkReply::sslErrors,
-            this, &NetworkReply::sslErrors);
+        CHECK(connect(_reply, &QNetworkReply::downloadProgress,
+            this, &NetworkReply::downloadProgress))
+                << "Could not connect to signal";
+        CHECK(connect(_reply, &QNetworkReply::uploadProgress,
+            this, &NetworkReply::uploadProgress))
+                << "Could not connect to signal";
+        CHECK(connect(_reply, &QNetworkReply::finished,
+            this, &NetworkReply::finished))
+                << "Could not connect to signal";
+        CHECK(connect(_reply, &QNetworkReply::sslErrors,
+            this, &NetworkReply::sslErrors))
+                << "Could not connect to signal";
 	// because error is overloaded we need to help the compiler
-	connect(_reply, static_cast<void(QNetworkReply::*)
+	CHECK(connect(_reply, static_cast<void(QNetworkReply::*)
 	    (QNetworkReply::NetworkError)>(&QNetworkReply::error),
-		this, &NetworkReply::error);
+		this, &NetworkReply::error))
+                    << "Could not connect to signal";
     }
 }
 
@@ -113,6 +121,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/network_reply.h'
--- ubuntu-download-manager-priv/system/network_reply.h	2014-02-11 15:35:52 +0000
+++ src/common/priv/ubuntu/transfers/system/network_reply.h	2014-04-11 16:06:36 +0000
@@ -27,7 +27,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -49,6 +49,7 @@
  signals:
     // signals forwarded from the real reply object
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+    void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
     void error(QNetworkReply::NetworkError code);
     void finished();
     void sslErrors(const QList<QSslError>& errors);
@@ -61,7 +62,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/process.cpp'
--- ubuntu-download-manager-priv/system/process.cpp	2014-01-29 14:40:16 +0000
+++ src/common/priv/ubuntu/transfers/system/process.cpp	2014-04-11 16:06:36 +0000
@@ -17,34 +17,38 @@
  */
 
 #include <QProcess>
+#include <glog/logging.h>
+#include <ubuntu/transfers/system/logger.h>
 #include "process.h"
-#include "logger.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
-
 Process::Process(QObject* parent)
     : QObject(parent) {
     _process = new QProcess(this);
     _process->setProcessChannelMode(QProcess::SeparateChannels);
 
     // connect so that we foward the signals
-    connect(_process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>
-        (&QProcess::finished),
-            this, &Process::finished);
-    connect(_process, static_cast<void(QProcess::*)(QProcess::ProcessError)>
-            (&QProcess::error),
-                this, &Process::error);
+    CHECK(connect(_process, 
+        static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>
+            (&QProcess::finished), this, &Process::finished))
+                << "Could not connect to signal";
+    CHECK(connect(_process,
+        static_cast<void(QProcess::*)(QProcess::ProcessError)>
+            (&QProcess::error), this, &Process::error))
+                << "Could not connect to signal";
 
     // connect so that we can log the stdout and stderr of the process
-    connect(_process, &QProcess::readyReadStandardError,
-        this, &Process::onReadyReadStandardError);
-    connect(_process, &QProcess::readyReadStandardOutput,
-        this, &Process::onReadyReadStandardOutput);
+    CHECK(connect(_process, &QProcess::readyReadStandardError,
+        this, &Process::onReadyReadStandardError))
+            << "Could not connect to signal";
+    CHECK(connect(_process, &QProcess::readyReadStandardOutput,
+        this, &Process::onReadyReadStandardOutput))
+            << "Could not connect to signal";
 }
 
 void
@@ -87,6 +91,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/process.h'
--- ubuntu-download-manager-priv/system/process.h	2014-01-29 14:40:16 +0000
+++ src/common/priv/ubuntu/transfers/system/process.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -57,7 +57,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/process_factory.cpp'
--- ubuntu-download-manager-priv/system/process_factory.cpp	2014-02-01 09:01:47 +0000
+++ src/common/priv/ubuntu/transfers/system/process_factory.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -66,6 +66,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/process_factory.h'
--- ubuntu-download-manager-priv/system/process_factory.h	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/process_factory.h	2014-04-11 16:06:36 +0000
@@ -25,7 +25,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -52,7 +52,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/request_factory.cpp'
--- ubuntu-download-manager-priv/system/request_factory.cpp	2014-02-01 09:01:47 +0000
+++ src/common/priv/ubuntu/transfers/system/request_factory.cpp	2014-04-11 16:06:36 +0000
@@ -16,12 +16,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <ubuntu/transfers/system/logger.h>
+#include <glog/logging.h>
 #include "request_factory.h"
-#include "logger.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -36,8 +37,7 @@
 }
 
 NetworkReply*
-RequestFactory::get(const QNetworkRequest& request) {
-    QNetworkReply* qreply = _nam->get(request);
+RequestFactory::buildRequest(QNetworkReply* qreply) {
     NetworkReply* reply = new NetworkReply(qreply);
 
     if (_certs.count() > 0) {
@@ -50,16 +50,31 @@
         // the connections for too long
         _replies.append(reply);
 
-        connect(reply, &NetworkReply::error,
-            this, &RequestFactory::onError);
-        connect(reply, &NetworkReply::finished,
-            this, &RequestFactory::onFinished);
-        connect(reply, &NetworkReply::sslErrors,
-            this, &RequestFactory::onSslErrors);
+        CHECK(connect(reply, &NetworkReply::error,
+            this, &RequestFactory::onError))
+                << "Could not connect to signal";
+        CHECK(connect(reply, &NetworkReply::finished,
+            this, &RequestFactory::onFinished))
+                << "Could not connect to signal";
+        CHECK(connect(reply, &NetworkReply::sslErrors,
+            this, &RequestFactory::onSslErrors))
+                << "Could not connect to signal";
     }
     return reply;
 }
 
+NetworkReply*
+RequestFactory::get(const QNetworkRequest& request) {
+    auto qreply = _nam->get(request);
+    return buildRequest(qreply);
+}
+
+NetworkReply*
+RequestFactory::post(const QNetworkRequest& request, File* data) {
+    auto qreply = _nam->post(request, data->device());
+    return buildRequest(qreply);
+}
+
 QList<QSslCertificate>
 RequestFactory::acceptedCertificates() {
     return _certs;
@@ -155,6 +170,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/request_factory.h'
--- ubuntu-download-manager-priv/system/request_factory.h	2014-02-07 10:06:24 +0000
+++ src/common/priv/ubuntu/transfers/system/request_factory.h	2014-04-11 16:06:36 +0000
@@ -25,11 +25,12 @@
 #include <QObject>
 #include <QSslCertificate>
 #include <QSslError>
+#include <ubuntu/transfers/system/file_manager.h>
 #include "network_reply.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -38,6 +39,7 @@
 
  public:
     virtual NetworkReply* get(const QNetworkRequest& request);
+    virtual NetworkReply* post(const QNetworkRequest& request, File* data);
 
     // mainly for testing purposes
     virtual QList<QSslCertificate> acceptedCertificates();
@@ -55,6 +57,7 @@
 
  private:
     void removeNetworkReply(NetworkReply* reply);
+    NetworkReply* buildRequest(QNetworkReply* qreply);
 
  private slots:
     void onError(QNetworkReply::NetworkError);
@@ -78,7 +81,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/system_network_info.cpp'
--- ubuntu-download-manager-priv/system/system_network_info.cpp	2014-02-01 09:01:47 +0000
+++ src/common/priv/ubuntu/transfers/system/system_network_info.cpp	2014-04-11 16:06:36 +0000
@@ -18,12 +18,13 @@
 
 #include <QNetworkConfigurationManager>
 #include <QNetworkSession>
-#include "logger.h"
+#include <glog/logging.h>
+#include <ubuntu/transfers/system/logger.h>
 #include "system_network_info.h"
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -37,56 +38,78 @@
 
 #ifdef DEBUG
     // in debug do log the changes else just fwd them
-    connect(_info, &QNetworkInfo::cellIdChanged, this,
-        &SystemNetworkInfo::onCellIdChanged);
-    connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, this,
-        &SystemNetworkInfo::onCurrentCellDataTechnologyChanged);
-    connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
-        &SystemNetworkInfo::onCurrentMobileCountryCodeChanged);
-    connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
-        &SystemNetworkInfo::onCurrentMobileNetworkCodeChanged);
-    connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
-        &SystemNetworkInfo::onCurrentNetworkModeChanged);
-    connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
-        &SystemNetworkInfo::onLocationAreaCodeChanged);
-    connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
-        &SystemNetworkInfo::onNetworkInterfaceCountChanged);
-    connect(_info, &QNetworkInfo::networkNameChanged, this,
-        &SystemNetworkInfo::onNetworkNameChanged);
-    connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
-        &SystemNetworkInfo::onNetworkSignalStrengthChanged);
-    connect(_info, &QNetworkInfo::networkStatusChanged, this,
-        &SystemNetworkInfo::onNetworkStatusChanged);
+    CHECK(connect(_info, &QNetworkInfo::cellIdChanged, this,
+        &SystemNetworkInfo::onCellIdChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged,
+        this, &SystemNetworkInfo::onCurrentCellDataTechnologyChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
+        &SystemNetworkInfo::onCurrentMobileCountryCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
+        &SystemNetworkInfo::onCurrentMobileNetworkCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
+        &SystemNetworkInfo::onCurrentNetworkModeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
+        &SystemNetworkInfo::onLocationAreaCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
+        &SystemNetworkInfo::onNetworkInterfaceCountChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkNameChanged, this,
+        &SystemNetworkInfo::onNetworkNameChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
+        &SystemNetworkInfo::onNetworkSignalStrengthChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkStatusChanged, this,
+        &SystemNetworkInfo::onNetworkStatusChanged))
+                    << "Could not connect to signal";
 
-    connect(_configMan,
+    CHECK(connect(_configMan,
         &QNetworkConfigurationManager::onlineStateChanged, this,
-        &SystemNetworkInfo::onOnlineStateChanged);
+        &SystemNetworkInfo::onOnlineStateChanged))
+                    << "Could not connect to signal";
 #else
     // connect to interesting signals
-    connect(_info, &QNetworkInfo::cellIdChanged, this,
-        &SystemNetworkInfo::cellIdChanged);
-    connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged, this,
-        &SystemNetworkInfo::currentCellDataTechnologyChanged);
-    connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
-        &SystemNetworkInfo::currentMobileCountryCodeChanged);
-    connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
-        &SystemNetworkInfo::currentMobileNetworkCodeChanged);
-    connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
-        &SystemNetworkInfo::currentNetworkModeChanged);
-    connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
-        &SystemNetworkInfo::locationAreaCodeChanged);
-    connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
-        &SystemNetworkInfo::networkInterfaceCountChanged);
-    connect(_info, &QNetworkInfo::networkNameChanged, this,
-        &SystemNetworkInfo::networkNameChanged);
-    connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
-        &SystemNetworkInfo::networkSignalStrengthChanged);
-    connect(_info, &QNetworkInfo::networkStatusChanged, this,
-        &SystemNetworkInfo::networkStatusChanged);
+    CHECK(connect(_info, &QNetworkInfo::cellIdChanged, this,
+        &SystemNetworkInfo::cellIdChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentCellDataTechnologyChanged,
+        this, &SystemNetworkInfo::currentCellDataTechnologyChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentMobileCountryCodeChanged, this,
+        &SystemNetworkInfo::currentMobileCountryCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentMobileNetworkCodeChanged, this,
+        &SystemNetworkInfo::currentMobileNetworkCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::currentNetworkModeChanged, this,
+        &SystemNetworkInfo::currentNetworkModeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::locationAreaCodeChanged, this,
+        &SystemNetworkInfo::locationAreaCodeChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkInterfaceCountChanged, this,
+        &SystemNetworkInfo::networkInterfaceCountChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkNameChanged, this,
+        &SystemNetworkInfo::networkNameChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkSignalStrengthChanged, this,
+        &SystemNetworkInfo::networkSignalStrengthChanged))
+                    << "Could not connect to signal";
+    CHECK(connect(_info, &QNetworkInfo::networkStatusChanged, this,
+        &SystemNetworkInfo::networkStatusChanged))
+                    << "Could not connect to signal";
 
-    connect(_configMan,
+    CHECK(connect(_configMan,
         &QNetworkConfigurationManager::onlineStateChanged, this,
-        &SystemNetworkInfo::onlineStateChanged);
+        &SystemNetworkInfo::onlineStateChanged))
+                    << "Could not connect to signal";
 #endif
 
 }
@@ -209,6 +232,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/system_network_info.h'
--- ubuntu-download-manager-priv/system/system_network_info.h	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/system_network_info.h	2014-04-11 16:06:36 +0000
@@ -28,7 +28,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -97,7 +97,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/timer.cpp'
--- ubuntu-download-manager-priv/system/timer.cpp	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/timer.cpp	2014-04-11 16:06:36 +0000
@@ -17,12 +17,13 @@
  */
 
 #include <QTimer>
+#include <glog/logging.h>
 #include "timer.h"
 
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -31,7 +32,8 @@
     _timer = new QTimer(this);
     _timer->setSingleShot(true);
 
-    connect(_timer, &QTimer::timeout, this, &Timer::timeout);
+    CHECK(connect(_timer, &QTimer::timeout, this, &Timer::timeout))
+        << "Could not connect to signal";
 }
 
 bool
@@ -51,6 +53,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/timer.h'
--- ubuntu-download-manager-priv/system/timer.h	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/timer.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -49,7 +49,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/priv/ubuntu/transfers/system/uuid_factory.cpp'
--- ubuntu-download-manager-priv/system/uuid_factory.cpp	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/uuid_factory.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -35,6 +35,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/uuid_factory.h'
--- ubuntu-download-manager-priv/system/uuid_factory.h	2014-01-16 15:42:53 +0000
+++ src/common/priv/ubuntu/transfers/system/uuid_factory.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -39,7 +39,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 #endif  // DOWNLOADER_LIB_UUID_FACTORY_H

=== modified file 'src/common/priv/ubuntu/transfers/system/uuid_utils.cpp'
--- ubuntu-download-manager-priv/system/uuid_utils.cpp	2013-10-29 13:42:44 +0000
+++ src/common/priv/ubuntu/transfers/system/uuid_utils.cpp	2014-04-11 16:06:36 +0000
@@ -21,7 +21,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -32,6 +32,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/priv/ubuntu/transfers/system/uuid_utils.h'
--- ubuntu-download-manager-priv/system/uuid_utils.h	2013-10-29 13:42:44 +0000
+++ src/common/priv/ubuntu/transfers/system/uuid_utils.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -35,7 +35,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== added file 'src/common/priv/ubuntu/transfers/transfer.cpp'
--- src/common/priv/ubuntu/transfers/transfer.cpp	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/transfer.cpp	2014-04-11 16:06:36 +0000
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <ubuntu/transfers/system/logger.h>
+#include "transfer.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+Transfer::Transfer(const QString& id,
+         const QString& path,
+         bool isConfined,
+         QObject* parent)
+    : QObject(parent),
+      _id(id),
+      _throttle(0),
+      _allowMobileData(true),
+      _state(Transfer::IDLE),
+      _dbusPath(path),
+      _isConfined(isConfined) {
+    _networkInfo = System::SystemNetworkInfo::instance();
+    setObjectName(id);
+}
+
+QString
+Transfer::transferId() const {
+    return _id;
+}
+
+QString
+Transfer::path() const {
+    return _dbusPath;
+}
+
+bool
+Transfer::isConfined() const {
+    return _isConfined;
+}
+
+Transfer::State
+Transfer::state() const {
+    return _state;
+}
+
+void
+Transfer::setState(Transfer::State state) {
+    if (_state != state) {
+        _state = state;
+        emit stateChanged();
+    }
+}
+
+bool
+Transfer::canTransfer() {
+    TRACE;
+    QNetworkInfo::NetworkMode mode = _networkInfo->currentNetworkMode();
+    switch (mode) {
+        case QNetworkInfo::UnknownMode:
+            qWarning() << "Network Mode unknown!";
+            return _allowMobileData;
+            break;
+        case QNetworkInfo::GsmMode:
+        case QNetworkInfo::CdmaMode:
+        case QNetworkInfo::WcdmaMode:
+        case QNetworkInfo::WimaxMode:
+        case QNetworkInfo::TdscdmaMode:
+        case QNetworkInfo::LteMode:
+            return _allowMobileData;
+        case QNetworkInfo::WlanMode:
+        case QNetworkInfo::EthernetMode:
+        case QNetworkInfo::BluetoothMode:
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool
+Transfer::isValid() const {
+    return _isValid;
+}
+
+QString
+Transfer::lastError() const {
+    return _lastError;
+}
+
+bool
+Transfer::addToQueue() const {
+    return _addToQueue;
+}
+
+void
+Transfer::setIsValid(bool isValid) {
+    _isValid = isValid;
+}
+
+void
+Transfer::setAddToQueue(bool addToQueue) {
+    _addToQueue = addToQueue;
+}
+
+void
+Transfer::setLastError(const QString& lastError) {
+    _lastError = lastError;
+}
+
+void
+Transfer::setThrottle(qulonglong speed) {
+    if (speed != _throttle) {
+        _throttle = speed;
+        emit throttleChanged();
+    }
+}
+
+qulonglong
+Transfer::throttle() {
+    return _throttle;
+}
+
+void
+Transfer::allowGSMData(bool allowed) {
+    if (_allowMobileData != allowed) {
+        _allowMobileData = allowed;
+        // emit the signals so that they q knows what to do
+        emit stateChanged();
+    }
+}
+
+bool
+Transfer::isGSMDataAllowed() {
+    return _allowMobileData;
+}
+
+void
+Transfer::cancel() {
+    setState(Transfer::CANCEL);
+    if(!_addToQueue)
+        cancelTransfer();
+}
+
+void
+Transfer::pause() {
+    setState(Transfer::PAUSE);
+    if(!_addToQueue)
+        pauseTransfer();
+}
+
+void
+Transfer::resume() {
+    setState(Transfer::RESUME);
+    if(!_addToQueue)
+        resumeTransfer();
+}
+
+void
+Transfer::start() {
+    setState(Transfer::START);
+    if(!_addToQueue)
+        startTransfer();
+}
+
+}  // General
+
+}  // Ubuntu

=== added file 'src/common/priv/ubuntu/transfers/transfer.h'
--- src/common/priv/ubuntu/transfers/transfer.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/ubuntu/transfers/transfer.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef UBUNTU_GENERAL_LIB_TRANSFER_H
+#define UBUNTU_GENERAL_LIB_TRANSFER_H
+
+#include <QObject>
+#include "ubuntu/transfers/system/system_network_info.h"
+
+namespace Ubuntu {
+
+namespace Transfers {
+
+class Transfer : public QObject {
+    Q_OBJECT
+
+ public:
+    enum State {
+        IDLE,
+        START,
+        PAUSE,
+        RESUME,
+        CANCEL,
+        FINISH,
+        ERROR
+    };
+
+    Transfer(const QString& id,
+             const QString& path,
+             bool isConfined,
+             QObject* parent = 0);
+
+    virtual QString transferId() const;
+    virtual QString path() const;
+    virtual bool isConfined() const;
+    virtual Transfer::State state() const;
+    virtual void setState(Transfer::State state);
+    virtual bool canTransfer();
+    virtual bool isValid() const;
+    virtual QString lastError() const;
+    virtual bool addToQueue() const;
+    virtual void setAddToQueue(bool addToQueue);
+
+    // methods to be overridden by the children
+    virtual bool pausable() { return false; }
+    virtual void cancelTransfer() {}
+    virtual void pauseTransfer() {}
+    virtual void resumeTransfer() {}
+    virtual void startTransfer() {}
+
+ public slots:  // NOLINT(whitespace/indent)
+
+    virtual void setThrottle(qulonglong speed);
+    virtual qulonglong throttle();
+    virtual void allowGSMData(bool allowed);
+    virtual bool isGSMDataAllowed();
+
+    virtual void cancel();
+    virtual void pause();
+    virtual void resume();
+    virtual void start();
+
+ signals:
+    void canceled(bool success);
+    void error(const QString& error);
+    void paused(bool success);
+    void resumed(bool success);
+    void started(bool success);
+
+    // internal signals
+    void stateChanged();
+    void throttleChanged();
+
+ protected:
+    void setIsValid(bool isValid);
+    void setLastError(const QString& lastError);
+
+ private:
+    bool _isValid = true;
+    bool _addToQueue = true;
+    QString _lastError = "";
+    QString _id;
+    qulonglong _throttle;
+    bool _allowMobileData;
+    Transfer::State _state;
+    QString _dbusPath;
+    bool _isConfined;
+    System::SystemNetworkInfo* _networkInfo;
+};
+
+}  // Transfers
+
+}  // Ubuntu
+
+#endif

=== added file 'src/common/priv/udm-priv-common.pro.THIS'
--- src/common/priv/udm-priv-common.pro.THIS	1970-01-01 00:00:00 +0000
+++ src/common/priv/udm-priv-common.pro.THIS	2014-04-11 16:06:36 +0000
@@ -0,0 +1,67 @@
+include(../common-project-config.pri)
+include(../common-vars.pri)
+
+QT       += network dbus systeminfo sql
+QT       -= gui
+DEFINES += NDEBUG
+
+TARGET = udm-priv-common
+TEMPLATE = lib
+
+DEFINES += UDMPRIVCOMMON_LIBRARY
+
+SOURCES += \
+    ubuntu/transfers/base_daemon.cpp \
+    ubuntu/transfers/base_manager.cpp \
+    ubuntu/transfers/queue.cpp \
+    ubuntu/transfers/transfer.cpp \
+    ubuntu/transfers/system/uuid_utils.cpp \
+    ubuntu/transfers/system/uuid_factory.cpp \
+    ubuntu/transfers/system/timer.cpp \
+    ubuntu/transfers/system/system_network_info.cpp \
+    ubuntu/transfers/system/request_factory.cpp \
+    ubuntu/transfers/system/process_factory.cpp \
+    ubuntu/transfers/system/process.cpp \
+    ubuntu/transfers/system/file_manager.cpp \
+    ubuntu/transfers/system/filename_mutex.cpp \
+    ubuntu/transfers/system/application.cpp \
+    ubuntu/transfers/system/apparmor.cpp \
+    ubuntu/transfers/system/network_reply.cpp \
+    ubuntu/transfers/system/dbus_proxy.cpp \
+    ubuntu/transfers/system/apn_request_factory.cpp \
+    ubuntu/transfers/system/apn_proxy.cpp
+
+HEADERS += \
+    ubuntu/transfers/base_daemon.h \
+    ubuntu/transfers/base_manager.h \
+    ubuntu/transfers/queue.h \
+    ubuntu/transfers/transfer.h \
+    ubuntu/transfers/adaptor_factory.h \
+    ubuntu/transfers/manager_factory.h \
+    ubuntu/transfers/system/uuid_utils.h \
+    ubuntu/transfers/system/uuid_factory.h \
+    ubuntu/transfers/system/timer.h \
+    ubuntu/transfers/system/system_network_info.h \
+    ubuntu/transfers/system/request_factory.h \
+    ubuntu/transfers/system/process_factory.h \
+    ubuntu/transfers/system/process.h \
+    ubuntu/transfers/system/file_manager.h \
+    ubuntu/transfers/system/filename_mutex.h \
+    ubuntu/transfers/system/application.h \
+    ubuntu/transfers/system/apparmor.h \
+    ubuntu/transfers/system/network_reply.h \
+    ubuntu/transfers/system/dbus_proxy.h \
+    ubuntu/transfers/system/apn_request_factory.h \
+    ubuntu/transfers/system/apn_proxy.h
+
+include(../common-installs-config.pri)
+
+LIBS += -lnih-dbus
+
+PKGCONFIG += dbus-1
+PKGCONFIG += libglog
+
+LIBS += -L$$OUT_PWD/../udm-common/ -ludm-common
+
+INCLUDEPATH += $$PWD/../udm-common
+DEPENDPATH += $$PWD/../udm-common

=== added file 'src/common/priv/udm-priv-common_global.h'
--- src/common/priv/udm-priv-common_global.h	1970-01-01 00:00:00 +0000
+++ src/common/priv/udm-priv-common_global.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,12 @@
+#ifndef UDMPRIVCOMMON_GLOBAL_H
+#define UDMPRIVCOMMON_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(UDMPRIVCOMMON_LIBRARY)
+#  define UDMPRIVCOMMONSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define UDMPRIVCOMMONSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // UDMPRIVCOMMON_GLOBAL_H

=== added directory 'src/common/public'
=== added file 'src/common/public/CMakeLists.txt'
--- src/common/public/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/common/public/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,62 @@
+pkg_check_modules(GLOG libglog)
+
+set(TARGET udm-common)
+
+set(SOURCES
+	ubuntu/transfers/metadata.cpp
+	ubuntu/transfers/errors/auth_error_struct.cpp
+	ubuntu/transfers/errors/http_error_struct.cpp
+	ubuntu/transfers/errors/network_error_struct.cpp
+	ubuntu/transfers/errors/process_error_struct.cpp
+	ubuntu/transfers/system/dbus_connection.cpp
+	ubuntu/transfers/system/hash_algorithm.cpp
+	ubuntu/transfers/system/logger.cpp
+)
+
+set(TRANSFERS_PUBLIC_HEADERS
+	ubuntu/transfers/metadata.h
+)
+
+set(ERRORS_PUBLIC_HEADERS
+	ubuntu/transfers/errors/auth_error_struct.h
+	ubuntu/transfers/errors/http_error_struct.h
+	ubuntu/transfers/errors/network_error_struct.h
+	ubuntu/transfers/errors/process_error_struct.h
+)
+
+set(PRIVATE_HEADERS
+	ubuntu/transfers/system/dbus_connection.h
+	ubuntu/transfers/system/hash_algorithm.h
+	ubuntu/transfers/system/logger.h
+)
+
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+
+add_library(${TARGET} SHARED
+	${SOURCES}
+	${TRANSFERS_PUBLIC_HEADERS}
+	${ERRORS_PUBLIC_HEADERS}
+	${PRIVATE_HEADERS}
+)
+
+set_target_properties(
+	${TARGET}
+
+	PROPERTIES
+	VERSION ${UDM_VERSION_MAJOR}.${UDM_VERSION_MINOR}.${UDM_VERSION_PATCH}
+	SOVERSION ${UDM_VERSION_MAJOR}
+)
+
+target_link_libraries(${TARGET}
+	${Qt5DBus_LIBRARIES}
+	${Qt5Network_LIBRARIES}
+	glog
+)
+
+configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${TRANSFERS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ubuntu/transfers)
+install(FILES ${ERRORS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ubuntu/transfers/errors)

=== added directory 'src/common/public/ubuntu'
=== added directory 'src/common/public/ubuntu/transfers'
=== added directory 'src/common/public/ubuntu/transfers/errors'
=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/auth_error_struct.cpp' => 'src/common/public/ubuntu/transfers/errors/auth_error_struct.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/auth_error_struct.cpp	2014-02-11 15:35:52 +0000
+++ src/common/public/ubuntu/transfers/errors/auth_error_struct.cpp	2014-04-11 16:06:36 +0000
@@ -21,7 +21,9 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 AuthErrorStruct::AuthErrorStruct()
     : _type(),
@@ -87,6 +89,7 @@
     return _phrase;
 }
 
-}  // DownloadManager
+}  // Errors
 
+}  // Transfers
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/auth_error_struct.h' => 'src/common/public/ubuntu/transfers/errors/auth_error_struct.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/auth_error_struct.h	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/auth_error_struct.h	2014-04-11 16:06:36 +0000
@@ -19,13 +19,13 @@
 #ifndef DOWNLOADER_LIB_AUTH_ERROR_STRUCT_H
 #define DOWNLOADER_LIB_AUTH_ERROR_STRUCT_H
 
-#include "common.h"
-
 class QDBusArgument;
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 /*!
     \class AuthErrorStruct 
@@ -113,7 +113,9 @@
     QString _phrase;
 };
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu
 

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp' => 'src/common/public/ubuntu/transfers/errors/http_error_struct.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.cpp	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/http_error_struct.cpp	2014-04-11 16:06:36 +0000
@@ -21,7 +21,9 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 HttpErrorStruct::HttpErrorStruct()
     : _code(200),
@@ -75,6 +77,8 @@
     return _phrase;
 }
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h' => 'src/common/public/ubuntu/transfers/errors/http_error_struct.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/http_error_struct.h	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/http_error_struct.h	2014-04-11 16:06:36 +0000
@@ -20,13 +20,14 @@
 #define DOWNLOADER_LIB_HTTP_ERROR_STRUCT_H
 
 #include <QString>
-#include "common.h"
 
 class QDBusArgument;
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 /*!
     \class HttpErrorStruct 
@@ -35,7 +36,7 @@
            manager to the different clients.
     \since 0.3
 */
-class DOWNLOAD_MANAGER_EXPORT HttpErrorStruct {
+class HttpErrorStruct {
     Q_PROPERTY(int code READ getCode)
     Q_PROPERTY(QString phrase READ getPhrase)
 
@@ -101,8 +102,9 @@
     QString _phrase;
 };
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu
-
 #endif // HTTP_ERROR_STRUCT_H

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp' => 'src/common/public/ubuntu/transfers/errors/network_error_struct.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.cpp	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/network_error_struct.cpp	2014-04-11 16:06:36 +0000
@@ -22,7 +22,9 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 NetworkErrorStruct::NetworkErrorStruct()
     :  _code(0),
@@ -161,6 +163,8 @@
     return _phrase;
 }
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h' => 'src/common/public/ubuntu/transfers/errors/network_error_struct.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/network_error_struct.h	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/network_error_struct.h	2014-04-11 16:06:36 +0000
@@ -20,13 +20,14 @@
 #define DOWNLOADER_LIB_NETWORK_ERROR_STRUCT_H
 
 #include <QString>
-#include "common.h"
 
 class QDBusArgument;
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 /*!
     \class NetworkErrorStruct 
@@ -35,7 +36,7 @@
            manager to the different clients.
     \since 0.3
 */
-class DOWNLOAD_MANAGER_EXPORT NetworkErrorStruct {
+class NetworkErrorStruct {
     Q_PROPERTY(int code READ getCode)
     Q_PROPERTY(QString phrase READ getPhrase)
 
@@ -106,7 +107,9 @@
     QString _phrase;
 };
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu
 

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp' => 'src/common/public/ubuntu/transfers/errors/process_error_struct.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.cpp	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/process_error_struct.cpp	2014-04-11 16:06:36 +0000
@@ -22,7 +22,9 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 ProcessErrorStruct::ProcessErrorStruct()
     : _code(0),
@@ -152,7 +154,8 @@
     return _stderr;
 }
 
+}  // Errors
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h' => 'src/common/public/ubuntu/transfers/errors/process_error_struct.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/process_error_struct.h	2014-03-06 12:39:08 +0000
+++ src/common/public/ubuntu/transfers/errors/process_error_struct.h	2014-04-11 16:06:36 +0000
@@ -20,13 +20,14 @@
 #define DOWNLOADER_LIB_PROCESS_ERROR_STRUCT_H
 
 #include <QString>
-#include "common.h"
 
 class QDBusArgument;
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
+
+namespace Errors {
 
 /*!
     \class ProcessErrorStruct
@@ -35,7 +36,7 @@
            manager to the different clients.
     \since 0.3
 */
-class DOWNLOAD_MANAGER_EXPORT ProcessErrorStruct {
+class ProcessErrorStruct {
     Q_PROPERTY(int code READ getCode)
     Q_PROPERTY(int exitCode READ getExitCode)
     Q_PROPERTY(QString phrase READ getPhrase)
@@ -163,7 +164,9 @@
     QString _stderr;
 };
 
-}  // DownloadManager
+}  // Errors
+
+}  // Transfers
 
 }  // Ubuntu
 

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/metadata.cpp' => 'src/common/public/ubuntu/transfers/metadata.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/metadata.cpp	2014-02-18 23:59:20 +0000
+++ src/common/public/ubuntu/transfers/metadata.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 const QString Metadata::COMMAND_KEY = "post-download-command";
 const QString Metadata::COMMAND_FILE_KEY = "$file";

=== renamed file 'ubuntu-download-manager-common/ubuntu/download_manager/metadata.h' => 'src/common/public/ubuntu/transfers/metadata.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/metadata.h	2014-02-18 23:59:20 +0000
+++ src/common/public/ubuntu/transfers/metadata.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 class Metadata : public QVariantMap {
 

=== renamed directory 'ubuntu-download-manager-common/ubuntu/download_manager/system' => 'src/common/public/ubuntu/transfers/system'
=== modified file 'src/common/public/ubuntu/transfers/system/dbus_connection.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.cpp	2014-01-22 16:53:05 +0000
+++ src/common/public/ubuntu/transfers/system/dbus_connection.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -64,6 +64,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/public/ubuntu/transfers/system/dbus_connection.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/system/dbus_connection.h	2014-01-22 16:53:05 +0000
+++ src/common/public/ubuntu/transfers/system/dbus_connection.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -48,7 +48,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== modified file 'src/common/public/ubuntu/transfers/system/hash_algorithm.cpp'
--- ubuntu-download-manager-common/ubuntu/download_manager/system/hash_algorithm.cpp	2013-11-12 12:30:18 +0000
+++ src/common/public/ubuntu/transfers/system/hash_algorithm.cpp	2014-04-11 16:06:36 +0000
@@ -20,7 +20,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -77,6 +77,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== modified file 'src/common/public/ubuntu/transfers/system/hash_algorithm.h'
--- ubuntu-download-manager-common/ubuntu/download_manager/system/hash_algorithm.h	2013-11-12 12:30:18 +0000
+++ src/common/public/ubuntu/transfers/system/hash_algorithm.h	2014-04-11 16:06:36 +0000
@@ -25,7 +25,7 @@
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -40,7 +40,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== renamed file 'ubuntu-download-manager-priv/system/logger.cpp' => 'src/common/public/ubuntu/transfers/system/logger.cpp'
--- ubuntu-download-manager-priv/system/logger.cpp	2014-03-06 13:00:01 +0000
+++ src/common/public/ubuntu/transfers/system/logger.cpp	2014-04-11 16:06:36 +0000
@@ -83,23 +83,13 @@
     return out;
 }
 
-std::ostream& operator<<(std::ostream &out, StructList list) {
-    out << "(";
-    foreach(const GroupDownloadStruct& group, list) {
-        out << "{ url:" << group.getUrl() << " hash:" << group.getHash()
-            << " local file:" << group.getLocalFile() << "}";
-    }
-    out << ")";
-    return out;
-}
-
 namespace {
     const QString LOG_NAME = "ubuntu-download-manager.log";
 }
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -163,6 +153,6 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu

=== renamed file 'ubuntu-download-manager-priv/system/logger.h' => 'src/common/public/ubuntu/transfers/system/logger.h'
--- ubuntu-download-manager-priv/system/logger.h	2014-02-13 17:28:10 +0000
+++ src/common/public/ubuntu/transfers/system/logger.h	2014-04-11 16:06:36 +0000
@@ -24,7 +24,6 @@
 #include <QString>
 #include <QTextStream>
 #include <QtGlobal>
-#include <ubuntu/download_manager/metatypes.h>
 #include <glog/logging.h>
 #include <iostream>
 #include <sstream>
@@ -36,6 +35,8 @@
 
 #define TRACE DLOG(INFO) << __PRETTY_FUNCTION__
 
+typedef QMap<QString, QString> StringMap;
+
 std::ostream& operator<<(std::ostream &out, const QString& var);
 std::ostream& operator<<(std::ostream &out, const QByteArray& var);
 std::ostream& operator<<(std::ostream &out, const QStringList& var);
@@ -44,11 +45,10 @@
 std::ostream& operator<<(std::ostream &out, const QDBusError& error);
 std::ostream& operator<<(std::ostream &out, const QVariantMap& map);
 std::ostream& operator<<(std::ostream &out, const QMap<QString, QString>& map);
-std::ostream& operator<<(std::ostream &out, StructList list);
 
 namespace Ubuntu {
 
-namespace DownloadManager {
+namespace Transfers {
 
 namespace System {
 
@@ -68,7 +68,7 @@
 
 }  // System
 
-}  // DownloadManager
+}  // Transfers
 
 }  // Ubuntu
 

=== added file 'src/common/public/udm-common.pc.in'
--- src/common/public/udm-common.pc.in	1970-01-01 00:00:00 +0000
+++ src/common/public/udm-common.pc.in	2014-04-11 16:06:36 +0000
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/ubuntu/transfers
+
+Name: udm-common
+Description: Common Ubuntu Upload Download Manager lib
+Version: @UDM_VERSION_MAJOR@.@UDM_VERSION_MINOR@.@UDM_VERSION_PATCH@
+Libs: -L${libdir} -ludm-common
+Requires: Qt5Core Qt5DBus
+Cflags:  -I${includedir}
+

=== added file 'src/common/public/udm-common_global.h'
--- src/common/public/udm-common_global.h	1970-01-01 00:00:00 +0000
+++ src/common/public/udm-common_global.h	2014-04-11 16:06:36 +0000
@@ -0,0 +1,12 @@
+#ifndef UDMCOMMON_GLOBAL_H
+#define UDMCOMMON_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(UDMCOMMON_LIBRARY)
+#  define UDMCOMMONSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define UDMCOMMONSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // UDMCOMMON_GLOBAL_H

=== added directory 'src/downloads'
=== added file 'src/downloads/CMakeLists.txt'
--- src/downloads/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/downloads/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,22 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(client)
+add_subdirectory(common)
+add_subdirectory(daemon)
+add_subdirectory(priv)
+add_subdirectory(qml)
+add_subdirectory(test-daemon)

=== renamed directory 'ubuntu-download-manager-client' => 'src/downloads/client'
=== added file 'src/downloads/client/CMakeLists.txt'
--- src/downloads/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/downloads/client/CMakeLists.txt	2014-04-11 16:06:36 +0000
@@ -0,0 +1,68 @@
+set(TARGET ubuntu-download-manager-client)
+
+set(SOURCES
+        ubuntu/download_manager/download_impl.cpp
+        ubuntu/download_manager/download_interface.cpp
+	ubuntu/download_manager/downloads_list_impl.cpp
+        ubuntu/download_manager/download_pendingcall_watcher.cpp
+        ubuntu/download_manager/error.cpp
+        ubuntu/download_manager/group_download.cpp
+        ubuntu/download_manager/manager.cpp
+        ubuntu/download_manager/manager_impl.cpp
+        ubuntu/download_manager/manager_interface.cpp
+        ubuntu/download_manager/manager_pendingcall_watcher.cpp
+        ubuntu/download_manager/pending_call_watcher.cpp
+)
+
+set(PUBLIC_HEADERS
+        ubuntu/download_manager/download.h
+	ubuntu/download_manager/downloads_list.h
+        ubuntu/download_manager/error.h
+        ubuntu/download_manager/group_download.h
+        ubuntu/download_manager/manager.h
+)
+
+set(PRIVATE_HEADERS
+        ubuntu/download_manager/download_impl.h
+        ubuntu/download_manager/download_interface.h
+	ubuntu/download_manager/downloads_list_impl.h
+        ubuntu/download_manager/download_pendingcall_watcher.h
+        ubuntu/download_manager/manager_impl.h
+        ubuntu/download_manager/manager_interface.h
+        ubuntu/download_manager/manager_pendingcall_watcher.h
+        ubuntu/download_manager/pending_call_watcher.h
+)
+
+include_directories(${Qt5DBus_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+
+add_library(${TARGET} SHARED 
+	${SOURCES}
+	${PUBLIC_HEADERS}
+	${PRIVATE_HEADERS}
+)
+
+set_target_properties(
+	${TARGET}
+
+	PROPERTIES
+	VERSION ${UDM_VERSION_MAJOR}.${UDM_VERSION_MINOR}.${UDM_VERSION_PATCH}
+	SOVERSION ${UDM_VERSION_MAJOR}
+)
+
+target_link_libraries(${TARGET}
+	${Qt5DBus_LIBRARIES}
+	${GLOG_LIBRARIES}
+	udm-common
+        ubuntu-download-manager-common
+)
+
+configure_file(${TARGET}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc @ONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
+install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ubuntu/download_manager)

=== modified file 'src/downloads/client/ubuntu-download-manager-client.pc.in'
--- ubuntu-download-manager-client/ubuntu-download-manager-client.pc.in	2013-12-03 13:29:34 +0000
+++ src/downloads/client/ubuntu-download-manager-client.pc.in	2014-04-11 16:06:36 +0000
@@ -1,12 +1,11 @@
-prefix=$$INSTALL_PREFIX
+prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=$$INSTALL_LIBDIR