Task #1418: ServiceBroker was dependant from APLCommon because CTStartDaemon...

Task #1418: ServiceBroker was dependant from APLCommon because CTStartDaemon was. Moved the executable to their own directory to be able to remove this dependancy.

CMake/LofarPackageList.cmake

@@ -69,6 +69,8 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(CASATools_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CASATools)
   set(TestSuite_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/TestSuite)
   set(CUDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons)
+  set(CT_StartDaemon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons/CT_StartDaemon)
+  set(Service_Broker_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons/Service_Broker)
   set(CURTDBDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CURTDBDaemons)
   set(PIC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PIC)
   set(PAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC)

MAC/APL/CUDaemons/CMakeLists.txt

 # $Id$
 
 # Do not split the following line, otherwise makeversion will fail!
-lofar_package(CUDaemons 1.0 DEPENDS Common ApplCommon APLCommon GCFTM MACIO)
+#lofar_package(CUDaemons 1.0 DEPENDS Common ApplCommon GCFTM MACIO)
 
-add_definitions(-DBOOST_DISABLE_THREADS)
+#add_definitions(-DBOOST_DISABLE_THREADS)
 
-add_subdirectory(src)
-#add_subdirectory(test)    # Tests currently do not compile!
+#add_subdirectory(src)
+##add_subdirectory(test)    # Tests currently do not compile!
+
+
+
+#include(LofarPackageVersion)
+
+#lofar_add_library(cudaemons Package__Version.cc)
+
+lofar_add_package(Service_Broker)
+lofar_add_package(CT_StartDaemon)

MAC/APL/CUDaemons/src/CTStartDaemon/CMakeLists.txt → MAC/APL/CUDaemons/CT_StartDaemon/CMakeLists.txt

 # $Id$
 
+lofar_package(CT_StartDaemon 1.0 DEPENDS Common ApplCommon GCFTM MACIO APLCommon)
+
+include(LofarPackageVersion)
+
+lofar_add_library(ctstartdaemon
+  Package__Version.cc)
+
 lofar_add_bin_program(CTStartDaemon CTStartDaemonMain.cc CTStartDaemon.cc)
+
 install(PROGRAMS startController.sh DESTINATION bin)
 install(FILES CTStartDaemon.conf DESTINATION etc)

MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc → MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc

@@ -36,7 +36,7 @@
 #include <APL/APLCommon/ControllerDefines.h>
 #include <APL/APLCommon/StartDaemon_Protocol.ph>
 #include "CTStartDaemon.h"
-#include <CUDaemons/Package__Version.h>
+#include <CT_StartDaemon/Package__Version.h>
 
 using namespace LOFAR::GCF::TM;
 
@@ -56,7 +56,7 @@ CTStartDaemon::CTStartDaemon(const string& name) :
 	itsTimerPort		(0)
 {
 	LOG_TRACE_FLOW(formatString("CTStartDaemon(%s)", getName().c_str()));
-	LOG_INFO(Version::getInfo<CUDaemonsVersion>("CTStartDaemon"));
+	LOG_INFO(Version::getInfo<CT_StartDaemonVersion>("CTStartDaemon"));
 
 	itsListener = new GCFTCPPort(*this, MAC_SVCMASK_STARTDAEMON, 
 								 GCFPortInterface::MSPP, STARTDAEMON_PROTOCOL);

MAC/APL/CUDaemons/src/ServiceBroker/CMakeLists.txt → MAC/APL/CUDaemons/Service_Broker/CMakeLists.txt

 # $Id$
 
+lofar_package(Service_Broker 1.0 DEPENDS Common GCFTM MACIO)
 # Add current directory to the -I path.
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+include(LofarPackageVersion)
+
+lofar_add_library(servicebroker
+  Package__Version.cc)
+
 lofar_add_bin_program(ServiceBroker ServiceBrokerMain.cc ServiceBroker.cc)
 
 install(FILES ServiceBroker.conf DESTINATION etc)

MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc → MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc

@@ -32,7 +32,7 @@
 #include <MACIO/GCF_Event.h>
 //#include <GCF/TM/GCF_Protocols.h>
 #include "ServiceBroker.h"
-#include <CUDaemons/Package__Version.h>
+#include <Service_Broker/Package__Version.h>
 
 namespace LOFAR {
     using namespace MACIO;
@@ -54,7 +54,7 @@ ServiceBroker::ServiceBroker() :
 	itsNrPorts(0),
 	itsNrFreePorts(0)
 {
-	LOG_INFO(Version::getInfo<CUDaemonsVersion>("ServiceBroker"));
+	LOG_INFO(Version::getInfo<Service_BrokerVersion>("ServiceBroker"));
 
 	// register the protocol for debugging purposes
 	registerProtocol(SB_PROTOCOL, SB_PROTOCOL_STRINGS);