16 files changed, 21 insertions(+), 55 deletions(-)

M module-services/CMakeLists.txt
D module-services/service-alarm/CMakeLists.txt
D module-services/service-alarm/tests/CMakeLists.txt
R module-services/{service-alarm => service-time}/AlarmHandlerFactory.cpp
R module-services/{service-alarm => service-time}/AlarmRepository.hpp
M module-services/service-time/CMakeLists.txt
R module-services/{service-alarm/include/service-alarm => service-time/include/service-time}/AlarmHandler.hpp
R module-services/{service-alarm/include/service-alarm => service-time/include/service-time}/AlarmHandlerFactory.hpp
R module-services/{service-alarm/include/service-alarm => service-time/include/service-time}/AlarmMessage.hpp
R module-services/{service-alarm/include/service-alarm => service-time/include/service-time}/AlarmServiceAPI.hpp
M module-services/service-time/tests/CMakeLists.txt
R module-services/{service-alarm => service-time}/tests/MockAlarmHandler.hpp
R module-services/{service-alarm => service-time}/tests/tests-AlarmHandlerFactory.cpp
R module-services/{service-alarm => service-time}/tests/tests-main.cpp
M products/BellHybrid/alarms/CMakeLists.txt
M products/BellHybrid/alarms/include/BellAlarmHandler.hpp

@@ 7,7 7,6 @@ include(${CMAKE_SOURCE_DIR}/module-lwip/lwip-includes.cmake)
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
-add_subdirectory( service-alarm )
 add_subdirectory( service-antenna )
 add_subdirectory( service-appmgr )
 add_subdirectory( service-audio )

@@ 1,36 0,0 @@
-message( "service-alarm  ${CMAKE_CURRENT_SOURCE_DIR}")
-
-add_library(service-alarm STATIC)
-
-set_target_properties(service-alarm PROPERTIES LINKER_LANGUAGE CXX)
-
-target_sources(service-alarm
-    PUBLIC
-        include/service-alarm/AlarmMessage.hpp
-        include/service-alarm/AlarmServiceAPI.hpp
-        include/service-alarm/AlarmHandler.hpp
-        include/service-alarm/AlarmHandlerFactory.hpp
-    PRIVATE
-        AlarmRepository.hpp
-        AlarmHandlerFactory.cpp
-)
-
-target_include_directories(service-alarm
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-
-target_link_libraries(service-alarm
-    PUBLIC
-        apps-common
-        module-db
-    PRIVATE
-        messagetype
-        module-sys
-)
-
-if (${ENABLE_TESTS})
-    add_subdirectory(tests)
-endif ()

@@ 1,11 0,0 @@
-add_catch2_executable(
-    NAME
-        service-alarm-tests
-    SRCS
-        tests-main.cpp
-        tests-AlarmHandlerFactory.cpp
-        MockAlarmHandler.hpp
-    LIBS
-        service-alarm
-        module-db
-)

@@ 4,8 4,8 @@
 #include <map>
 #include <memory>
 
-#include "include/service-alarm/AlarmHandler.hpp"
-#include "include/service-alarm/AlarmHandlerFactory.hpp"
+#include <service-time/AlarmHandler.hpp>
+#include <service-time/AlarmHandlerFactory.hpp>
 
 namespace alarms
 {

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <service-alarm/AlarmMessage.hpp>
+#include <service-time/AlarmMessage.hpp>
 
 #include <apps-common/AsyncTask.hpp>
 #include <module-sys/Service/Service.hpp>

@@ 2,6 2,7 @@
 message( "${PROJECT_NAME}  ${CMAKE_CURRENT_SOURCE_DIR}" )
 
 set(SOURCES
+    AlarmHandlerFactory.cpp
     ServiceTime.cpp
     TimeManager.cpp
     RTCcommand.cpp


@@ 14,6 15,7 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
 target_include_directories(${PROJECT_NAME}
     PUBLIC
         "${CMAKE_CURRENT_LIST_DIR}"
+        include
 )
 
 target_link_libraries(${PROJECT_NAME}

@@ 7,3 7,15 @@ add_catch2_executable(
         service-time
         module-sys
 )
+
+add_catch2_executable(
+    NAME
+        service-time-alarm-tests
+    SRCS
+        tests-main.cpp
+        tests-AlarmHandlerFactory.cpp
+        MockAlarmHandler.hpp
+    LIBS
+        service-time
+        module-db
+)

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <service-alarm/AlarmHandler.hpp>
+#include <service-time/AlarmHandler.hpp>
 
 namespace alarms
 {

@@ 3,7 3,7 @@
 
 #include "MockAlarmHandler.hpp"
 
-#include <service-alarm/AlarmHandlerFactory.hpp>
+#include <service-time/AlarmHandlerFactory.hpp>
 
 #include <catch2/catch.hpp>
 

@@ 17,5 17,5 @@ target_include_directories(alarms
 target_link_libraries(alarms
    PUBLIC
         module-db
-        service-alarm
+        service-time
 )

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <service-alarm/AlarmHandler.hpp>
+#include <service-time/AlarmHandler.hpp>
 
 namespace alarms
 {