Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
@@ -13,7 +13,7 @@ using namespace AlarmManagement;

 HandlerParticipant::HandlerParticipant(const std::shared_ptr<DdsHandler> &ddsHandler) : QObject()
  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -6,7 +6,7 @@ namespace AlarmManagement{

 ObjectEmergencyCall::ObjectEmergencyCall(Initialization *mainHandler, QObject *parent) : QObject(parent)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 ObjectEmergencyCall::~ObjectEmergencyCall()
@@ -28,7 +28,7 @@ namespace AreaEffectSimulation

 AbstractFiringStrategy::AbstractFiringStrategy(ObjectEffector *parent) : QObject(parent)
  , m_effector(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -21,7 +21,7 @@ namespace AreaEffectSimulation
 DdsHandler::DdsHandler(int domainId, int exerciseId, QObject *parent) : QObject(parent)
  , m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
  , m_currentTimeMSec(-1),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -47,7 +47,7 @@
 namespace AreaEffectSimulation
 {
 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
  QRandomGenerator(time(nullptr));
 #else
@@ -25,7 +25,7 @@ MineCorridorCreator::MineCorridorCreator(int equipNo, ObjectMineCorridor *omc) :
  , m_timeoutTimer(new QTimer(this))
  , m_omc(omc)
  , m_equipNo(equipNo),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_timeoutTimer->setInterval(s_timeoutInterval);
  m_timeoutTimer->setSingleShot(true);
  connect(m_timeoutTimer, &QTimer::timeout, this, &MineCorridorCreator::timeout, Qt::QueuedConnection);
@@ -52,7 +52,7 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle

 // ####### BaseDlRequest begin #######
 BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid) : ClientMessage(dataManager, client, type, typeId, uuid),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void BaseDlRequest::process()
 {
@@ -30,7 +30,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr)
  , m_dbHandler(nullptr)
  , m_handlerWebSocket(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -16,7 +16,7 @@
 namespace AssetManagement
 {
 ObjectAsset::ObjectAsset(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //------------------------------------------------------------------------------
@@ -14,7 +14,7 @@ namespace AssetManagement
 {
 ObjectMapDescription::ObjectMapDescription(MainHandler *mainHandler) : m_mainHandler(mainHandler)
  , m_order(-1),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 bool ObjectMapDescription::isValid() const
@@ -16,7 +16,7 @@
 namespace AssetManagement
 {
 ObjectRelayInfo::ObjectRelayInfo(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //------------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 namespace AssetManagement
 {
 ObjectTrainingArea::ObjectTrainingArea(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //------------------------------------------------------------------------------
@@ -76,7 +76,7 @@ DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *d
  , m_ismDtc(ismDtc)
  , m_timer(new QTimer)
  , m_isInitialized(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  Q_ASSERT(dts);
  Q_ASSERT(ismDtc);
  if(!m_ismDtc->isMainStructureElementEnabled())
@@ -43,7 +43,7 @@ ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId) : QOb
  , m_updateTimer(new QTimer(this))
  , m_lastSeenTimer(new QTimer(this))
  , m_bWarnedOnce(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_updateTimer->setSingleShot(true);
  connect(m_updateTimer, &QTimer::timeout, this, &ExerciseHandler::onUpdateTimerTimeout);

@@ -55,7 +55,7 @@ private:
 ExercisesHandler::ExercisesHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
  , m_triggerAvUpdateTimer(new QTimer(this))
  , m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc())),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_triggerAvUpdateTimer->setSingleShot(true);
  m_triggerAvUpdateTimer->setInterval(1000);
  connect(m_triggerAvUpdateTimer, &QTimer::timeout,
@@ -18,7 +18,7 @@ namespace AudioVideoManagement

 FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  Q_ASSERT(dts);
  Q_ASSERT(db);
 }
@@ -37,7 +37,7 @@
 using namespace AudioVideoManagement;

 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler() = default;

@@ -15,7 +15,7 @@ namespace AudioVideoManagement
 ObjectFrequencyPlanningStatus::ObjectFrequencyPlanningStatus(Interface::Dts *dts,
                                 DatabaseInterface *db) : m_dts(dts)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //-------------------------------------------------------------------------------------------------------------
@@ -77,7 +77,7 @@ namespace AudioVideoManagement

 ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  Q_ASSERT(dts);
  Q_ASSERT(db);
 }
@@ -16,7 +16,7 @@ namespace AudioVideoManagement
 ObjectVideoReceiver::ObjectVideoReceiver(Interface::Dts *dts,
                                         DatabaseInterface *db) : m_dts(dts)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //-------------------------------------------------------------------------------------------------------------
@@ -15,7 +15,7 @@ namespace AudioVideoManagement
 ObjectVideoTeam::ObjectVideoTeam(Interface::Dts *dts,
                                 DatabaseInterface *db) : m_dts(dts)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //-------------------------------------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ CesTestsBlockedAreas::CesTestsBlockedAreas(QObject *parent) : QObject(parent)
  , m_testId(0)
  , m_participantIndex(0)
  , m_DynamicParticipantIndex(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsBlockedAreas::~CesTestsBlockedAreas()
 {}
@@ -41,7 +41,7 @@ CesTestsBoobyTrap::CesTestsBoobyTrap(QObject *parent) : QObject(parent)
  , m_aesItemId(5)
  , m_chargeTypeId(252) // Verdeckte Ladung
  , m_countEventBoobyTrap(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsBoobyTrap::~CesTestsBoobyTrap()
 {}
@@ -40,7 +40,7 @@ CesTestsGasPipe::CesTestsGasPipe(QObject *parent) : QObject(parent)
  , m_aesItemId(5)
  , m_chargeTypeId(374) // SMART
  , m_countEventGasPipe(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsGasPipe::~CesTestsGasPipe()
 {}
@@ -36,7 +36,7 @@ CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
  , m_bTestsSuccessful(true)
  , m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
  , m_testId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsGeopairing::~CesTestsGeopairing()
 {}
@@ -36,7 +36,7 @@ CesTestsGeopairing::CesTestsGeopairing(QObject *parent) : QObject(parent)
  , m_bTestsSuccessful(true)
  , m_housePos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000")))
  , m_testId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsGeopairing::~CesTestsGeopairing()
 {}
@@ -79,7 +79,7 @@ CesTestsMineAreas::CesTestsMineAreas(QObject *parent) : QObject(parent)
  , m_aesItemId(5)
  , m_chargeTypeId(374) // SMART
  , m_countEventMineAreas(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 CesTestsMineAreas::~CesTestsMineAreas()
 {}
@@ -16,7 +16,7 @@ namespace TargetAreas
 DdsHandlerTargetAreas::DdsHandlerTargetAreas(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
  , m_participantEventId(0)
  , m_exerciseId(exerciseId),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandlerTargetAreas(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -21,7 +21,7 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent) : QObject(pare
  , m_currentDataRead(QByteArray())
  , m_portName(QStringLiteral("COM5"))
  , m_readBuffer(new QByteArray()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_receiveTimeoutTimer->setInterval(1700);
  connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
  m_spQuerry->restartQuerry();
@@ -19,7 +19,7 @@ ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent) : QObject(parent)
  , m_socket(nullptr)
  , m_timer(new QTimer(this))
  , m_currentDataRead(QByteArray()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_timer->setInterval(5000);
  connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);

@@ -16,7 +16,7 @@ ControlUnitHandler::ControlUnitHandler(QObject *parent) : QObject(parent)
  , m_connectionHandler(new ConnectionHandler(this))
  , m_timer(new QTimer(this))
  , m_feature(EffectShowManagement::Feature_e::NotSpecified),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_timer->setInterval(10000);
  connect(m_timer, &QTimer::timeout, this, &ControlUnitHandler::onConnectedToSerialConveter);
  m_timer->start();
@@ -23,7 +23,7 @@ HandlerVehicle::HandlerVehicle(MainHandler *mainHandler,
  , m_mainHandler(mainHandler)
  , m_volleyTimer(new QTimer(this))
  , m_remainingTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "HandlerVehicle ctor";
  m_volleyTimer->setSingleShot(true);
  m_remainingTimer->setInterval(1000);
@@ -29,7 +29,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_handlerTabData(nullptr)
  , m_handlerVehicle(nullptr)
  , m_handlerControlUnit(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -18,7 +18,7 @@ EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::Eff
                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_effectCluster(effectCluster)
  , m_handlerPdmData(handlerPdmData)
  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //=============================================================================
@@ -13,7 +13,7 @@ EffectShowExplosionArea::EffectShowExplosionArea(const AreaEffectSimulation::Exp
                                                 const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionArea(explosionArea)
  , m_handlerPdmData(handlerPdmData)
  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //=============================================================================
@@ -13,7 +13,7 @@ EffectShowExplosionCluster::EffectShowExplosionCluster(const AreaEffectSimulatio
                                                       const std::shared_ptr<HandlerPdmData>     &handlerPdmData) : m_explosionCluster(explosionCluster)
  , m_handlerPdmData(handlerPdmData)
  , m_numOfEffectShows(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //=============================================================================
@@ -15,7 +15,7 @@ EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &min
  , m_segment(getEffectShowSegment(mineArea))
  , m_utmZone(-1)
  , m_rotation(0.0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //=============================================================================
@@ -17,7 +17,7 @@ using namespace EffectShowManagement;

 HandlerAesData::HandlerAesData(Initialization *mainHandler) : QObject()
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //=============================================================================
 HandlerAesData::~HandlerAesData()
@@ -22,7 +22,7 @@ namespace EffectShowManagement
 HandlerEffectShowVehicleStatus::HandlerEffectShowVehicleStatus(Initialization *mainHandler,
                                                               QObject *parent) : QObject(parent)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_timerVehicleStatus.setSingleShot(true);
 }
 //=============================================================================
@@ -16,7 +16,7 @@ using namespace EffectShowManagement;
 HandlerMdmData::HandlerMdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
                               QObject *parent) : QObject(parent)
  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //=============================================================================
@@ -17,7 +17,7 @@ namespace EffectShowManagement
 HandlerPdmData::HandlerPdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
                               QObject *parent) : QObject(parent)
  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //=============================================================================

@@ -17,7 +17,7 @@ using namespace EffectShowManagement;
 HandlerPpmData::HandlerPpmData(Initialization *mainHandler,
                               QObject     *parent) : QObject(parent)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //=============================================================================

@@ -17,7 +17,7 @@ namespace EffectShowManagement
 ObjectAesData::ObjectAesData(Initialization *mainHandler,
                             QObject     *parent) : QObject(parent)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }
 //=============================================================================

@@ -30,7 +30,7 @@
 namespace ExerciseEventManagement
 {
 EemTests::EemTests(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 //-----------------------------------------------------------------------------------------------------------------------
 bool EemTests::init(int domainId, int exerciseId, int testId)
@@ -21,7 +21,7 @@ namespace ExerciseEventManagement
 WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
  , m_webSocketServer(new QWebSocketServer(QStringLiteral("AVS-Server"), QWebSocketServer::NonSecureMode, this))
  , m_timer(new QTimer()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_timer, &QTimer::timeout,
          this, &WebSocketHandler::onSendMessage);

@@ -34,7 +34,7 @@ HandlerDynamicParticipantData::HandlerDynamicParticipantData(MainHandler *mainHa
  , m_dbHandler(db)
  , m_eventServer(eventServer)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()

 //-----------------------------------------------------------------------------
@@ -33,7 +33,7 @@ HandlerEquipmentErrorRegistration::HandlerEquipmentErrorRegistration(MainHandler
  , m_dbHandler(db)
  , m_eventServer(eventServer)
  , m_ossDtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -26,7 +26,7 @@ HandlerParticipantEvent::HandlerParticipantEvent(MainHandler *mainHandler,
  , m_dbHandler(db)
  , m_eventServer(eventServer)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -29,7 +29,7 @@ MainHandler::MainHandler() : m_almService(nullptr)
  , m_mrkService(nullptr)
  , m_evlService(nullptr)
  , m_removeTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_removeTimer, &QTimer::timeout, this, &MainHandler::onRemoveKeys);
  m_removeTimer->setInterval(5000);
  m_removeTimer->setSingleShot(false);
@@ -66,7 +66,7 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
  , m_exerciseId(exerciseId)
  , m_lastUpdate(0)
  , m_bWebSocketDisconnectedWarnedOnce(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_wsReconnectTimer, &QTimer::timeout,
          this, &WebSocketAvs::openWebSocket);

@@ -26,7 +26,7 @@ WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *pare
  , m_wsServer(nullptr)
  , m_cleanupTimer(new QTimer(this))
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_cleanupTimer->setInterval(10000); // clear every 10s
  connect(m_cleanupTimer, &QTimer::timeout, this, &WebSocketEventServer::onCleanupLiveHistory);
 }
@@ -33,7 +33,7 @@ DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
  , m_dtcExercise(nullptr)
  , m_mainThreadId(QThread::currentThreadId())
  .getNGLLogger("UnitTests.DataTopicTests")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {  
  if (!DDS::QosProfile::setDefault())
    ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";

@@ -22,7 +22,7 @@ Initialisation::Initialisation() : m_domainParticipant(nullptr)
  , m_ddsSubscriber(nullptr)
  , m_subListener(new DTC::SubscriberListener)
  .getNGLLogger("UnitTests.Initialisation")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {  
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {  
  DDS::DefaultQos defaultQos;

  //if (!defaultQos.setDefaultQos(QStringList("/shd/CTC/SV/.default_dds_profile.xml")))
@@ -20,7 +20,7 @@ namespace ExerciseManagement
 {

 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -18,7 +18,7 @@ namespace ExerciseManagement
 ObjectExercisePhase::ObjectExercisePhase(const std::shared_ptr<DdsHandler> &ddsHandler,
                                         const std::shared_ptr<DatabaseInterface> &db) : m_ddsHandler(ddsHandler)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 ObjectExercisePhase::~ObjectExercisePhase ()
 {}
@@ -54,7 +54,7 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle

 // ####### BaseDlRequest begin #######
 BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void BaseDlRequest::process()
 {
@@ -17,7 +17,7 @@
 namespace FileManagement
 {
 HandlerFileTypeInfo::HandlerFileTypeInfo(MainHandler *mainHandler) : Base(mainHandler, getLogger("HandlerFileTypeInfo")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 //------------------------------------------------------------------------------------------------------
 HandlerFileTypeInfo::~HandlerFileTypeInfo()
@@ -28,7 +28,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_handlerFolder(nullptr)
  , m_handlerFileContent(nullptr)
  , m_handlerWebSocket(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -17,7 +17,7 @@ namespace FileManagement
 {

 CBI_PdfDownload::CBI_PdfDownload(unsigned short port) : CommandInterface(port, "PDF_DOWNLOAD"),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
 {
@@ -18,7 +18,7 @@ namespace FileManagement
 {
 PdfServer::PdfServer(MainHandler *mainHandler, QObject *parent) : QObject(parent)
  , m_tcpServer(TcpServer::instance(NGL::Connections::port(NGL::Connections::eConnection::FLM_PDF_SERVER))),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_tcpServer->setUserData(mainHandler);
  m_tcpServer->setUseWorkerThreads(false);
 }
@@ -16,7 +16,7 @@ namespace FilterManagement
 {

 MainHandler::MainHandler() : m_fltService(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 MainHandler::~MainHandler()
@@ -28,7 +28,7 @@ MainHandler::MainHandler() : m_handlerIed(nullptr)
  , m_esmService(nullptr)
  , m_gmpService(nullptr)
  , m_exerciseId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -38,13 +38,14 @@ int main(int argc, char *argv[])
 }

 //-------------------------------------------------------------------------------------------------------
-GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain() : m_minefieldInterpreter(nullptr)
+GmpMinefieldInterpreterTestsMain::GmpMinefieldInterpreterTestsMain()
+  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+  , m_minefieldInterpreter(nullptr)
  , m_receivedMinefield()
  , m_receivedVeType(0)
  , m_minefieldInterpreterTimer(nullptr)
  , m_minefieldSpy(nullptr)
-  .getNGLLogger("Tests.GmpMinefieldInterpreterTest")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+{
 }

 //-------------------------------------------------------------------------------------------------------
@@ -13,14 +13,26 @@
 namespace GuezMinelayerProcessing
 {

+#if BUILD_RTI
 DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
  : m_ddsConnector(ddsConnector)
+  , m_logger(getNGLLogger("GuezMinelayerProcessing.DdsHandler"))
+  , m_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
 {
  DEBUG_LOG(m_logger) << "DdsHandler(" << ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }
+#else
+DdsHandler::DdsHandler()
+  : m_logger(getNGLLogger("GuezMinelayerProcessing.DdsHandler"))
+  , m_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
+{
+  DEBUG_LOG(m_logger) << "DdsHandler() - RTI DDS not enabled";
+}
+#endif

 bool DdsHandler::init(const QStringList &qosFileList)
 {
+#if BUILD_RTI
  if (!m_ddsConnector->init(qosFileList))
  {
    ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
@@ -29,6 +41,10 @@ bool DdsHandler::init(const QStringList &qosFileList)

  // default initialize Publisher and Subscriber
  m_ddsConnector->initPublisherSubscriber();
+#else
+  Q_UNUSED(qosFileList)
+  DEBUG_LOG(m_logger) << "DdsHandler::init() - RTI DDS not enabled, skipping initialization";
+#endif

  return true;
 }
@@ -7,8 +7,10 @@
  */
 #pragma once

+#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
 #include <DDS/Core/topic_lock_master.h>
+#endif
 #include "logger.h"

 namespace GuezMinelayerProcessing
@@ -16,17 +18,25 @@ namespace GuezMinelayerProcessing
 class DdsHandler final
 {
 public:
+#if BUILD_RTI
  explicit DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
+#else
+  explicit DdsHandler();
+#endif
  ~DdsHandler() = default;

  bool init(const QStringList &qosFileList = QStringList());

+#if BUILD_RTI
  std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
+#endif
  std::shared_ptr<Core::TopicLockMaster> topicLockMaster() const { return m_topicLockMaster; }

 private:
  NGL::INGLLogger &m_logger;
+#if BUILD_RTI
  std::shared_ptr<DDSConnector::DdsConnector>       m_ddsConnector;
+#endif
  std::shared_ptr<Core::TopicLockMaster>            m_topicLockMaster;
 };

@@ -9,7 +9,9 @@

 #include "handler_minelayer_data.h"

+#if BUILD_RTI
 #include <AreaEffectSimulation/aes_ftc.h>
+#endif
 #include <AssetManagement/asm_dtc.h>
 #include <ExerciseManagement/exm_dtc.h>

@@ -18,6 +20,8 @@

 #include <QLineF>

+#if BUILD_RTI
+
 namespace GuezMinelayerProcessing
 {

@@ -27,7 +31,9 @@ HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &dd
  , m_ddsHandler(ddsHandler)
  , m_tabDtc(nullptr)
  , m_ppmDtc(nullptr)
+#if BUILD_RTI
  , m_aesFtc(nullptr)
+#endif
  , m_minefieldInterpreter(new ZSSI_WI_Minenfeld_Interpreter(this))
  , m_minefieldInterpreterTimer(new QTimer(this))
 {}
@@ -37,19 +43,24 @@ HandlerMinelayerData::~HandlerMinelayerData()

 bool HandlerMinelayerData::init()
 {
+#if BUILD_RTI
  // AES-Ftc
  m_aesFtc = AreaEffectSimulation::Interface::Ftc::create(m_ddsHandler->ddsConnector());
  bool ret = m_aesFtc->enableMineAreaModifyFromCtaData();
  if (!ret)
  {
-    ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaCreateFromCtaData()";
+    ERROR_LOG(m_logger) << "AesFtc Can not enable MineAreaModifyFromCtaData()";
    return false;
  }
+#endif


  // Data from training area base
  m_tabDtc = TrainingAreaBase::Interface::Dtc::create(m_ddsHandler->ddsConnector());
+  bool ret = true;
+#if BUILD_RTI
  ret &= m_tabDtc->enableSpecialSensorData();
+#endif
  ret &= m_tabDtc->enableMinelayerTrailerData();
  ret &= m_tabDtc->enableMinelayerThrowerData();
  if (!ret)
@@ -58,13 +69,17 @@ bool HandlerMinelayerData::init()
    return false;
  }

+#if BUILD_RTI
  connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::specialSensorDataChanged, this, &HandlerMinelayerData::onSpecialSensorDataChanged);
+#endif
  connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerTrailerDataChanged, this, &HandlerMinelayerData::onMinelayerTrailerData);
  connect(m_tabDtc.get(), &TrainingAreaBase::Interface::Dtc::minelayerThrowerDataChanged, this, &HandlerMinelayerData::onMinelayerThrowerData);

  // PPM for partyId Mapping
  m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->ddsConnector());
+#if BUILD_RTI
  ret &= m_ppmDtc->enableParticipant();
+#endif
  if (!ret)
  {
    ERROR_LOG(m_logger) << "PpmDtc Can not enable Participant Data";
@@ -290,6 +305,7 @@ static inline double compassFromMathAngleForSfm(int mathAngle)

 void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt)
 {
+#if BUILD_RTI
  AreaEffectSimulation::MineArea outData;
  outData.participantId(minefield.header.identitaet);
  outData.partyId(partyIdFromEquipmentNumber(minefield.header.identitaet)); // Get from PPM;
@@ -332,7 +348,7 @@ void HandlerMinelayerData::onSendMinefield(const wirkfeld_minensperre_rt &minefi

  // request create mine area from aes
  m_aesFtc->mineAreaModifyFromCtaDataRequest(outData, this);
-
+#endif
 }

 void HandlerMinelayerData::onStartMinefieldInterpreter()
@@ -349,4 +365,6 @@ void HandlerMinelayerData::onMineAreaModifyFromCtaDataReply(const Core::Function
    INFO_LOG(m_logger) << "Got onMineAreaCreateFromCtaDataReply reply with id " << replyObject.id();
 }

-}
+} // namespace GuezMinelayerProcessing
+
+#endif // BUILD_RTI
@@ -12,10 +12,12 @@
 #include <QPointF>
 #include <QTimer>

+#if BUILD_RTI
 #include <AreaEffectSimulation/aes_ftc.h>
+#include <Proxies/TrainingAreaBase/tab_dtc.h>
+#endif
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <ParticipantManagement/ppm.hpp>
-#include <Proxies/TrainingAreaBase/tab_dtc.h>
 #include "GFS_map_cont.h"

 #include "logger.h"
@@ -25,7 +27,9 @@ namespace GuezMinelayerProcessing
 class DdsHandler;
 class ZSSI_WI_Minenfeld_Interpreter;
 class HandlerMinelayerData : public QObject
+#if BUILD_RTI
    , protected AreaEffectSimulation::Interface::Ftc::MineAreaModifyFromCtaDataReplyHandler
+#endif
 {
  Q_OBJECT
 public:
@@ -35,7 +39,9 @@ public:

  bool init();

+#if BUILD_RTI
  void onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject) override final;
+#endif

 private slots:
  void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType);
@@ -55,7 +61,9 @@ private:
  std::shared_ptr<DdsHandler>                            m_ddsHandler;
  std::shared_ptr<TrainingAreaBase::Interface::Dtc>      m_tabDtc;
  std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
+#if BUILD_RTI
  std::shared_ptr<AreaEffectSimulation::Interface::Ftc>  m_aesFtc;
+#endif

  LtsCoordTrans::UtmCoordinate  m_baseCoord;

@@ -9,23 +9,34 @@
 #include "dds_handler.h"
 #include "handler_minelayer_data.h"

+#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
+#endif

 using namespace GuezMinelayerProcessing;

 Initialization::Initialization()
  : m_ddsHandler(nullptr)
+#if BUILD_RTI
  , m_handlerMinelayerData(nullptr)
+#endif
 {}

 Initialization::~Initialization()
 {
+#if BUILD_RTI
  m_handlerMinelayerData = nullptr;
+#endif
  m_ddsHandler = nullptr;
 }

-bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
+bool Initialization::initialize(
+#if BUILD_RTI
+  const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
+#endif
+)
 {
+#if BUILD_RTI
  if (m_handlerMinelayerData)
    return true;

@@ -44,6 +55,16 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
    ERROR_LOG(m_logger) << "Initialisation m_handlerMinelayerData failed.";
    return false;
  }
+#else
+  Q_UNUSED(ddsConnector)
+  // initialize DDS stub
+  m_ddsHandler.reset(new DdsHandler());
+  if (!m_ddsHandler->init())
+  {
+    ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
+    return false;
+  }
+#endif

  return true;
 }
@@ -6,7 +6,9 @@
  */
 #pragma once

+#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
+#endif
 #include <ngldb/db_service_handler.h>
 #include "svcgmpserver_export.h"
 #include "logger.h"
@@ -14,7 +16,9 @@
 namespace GuezMinelayerProcessing
 {
 class DdsHandler;
+#if BUILD_RTI
 class HandlerMinelayerData;
+#endif

 class GMP_SERVER_EXPORT Initialization final
 {
@@ -22,12 +26,18 @@ public:
  Initialization();
  ~Initialization();

-  bool initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
+  bool initialize(
+#if BUILD_RTI
+    const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
+#endif
+  );
  bool loadFromDatabase();

 private:
  NGL::INGLLogger &m_logger;
  std::shared_ptr<DdsHandler>           m_ddsHandler;
+#if BUILD_RTI
  std::shared_ptr<HandlerMinelayerData> m_handlerMinelayerData;
+#endif
 };
 } // namespace GuezMinelayerProcessing
@@ -9,7 +9,7 @@
 #pragma once

 #include <NGLLogger/INGLLogger.h>
-#include "svcgmpserver_export.h"
+#include "gmp_export.h"

 namespace GuezMinelayerProcessing
 {
@@ -7,7 +7,7 @@

 #pragma once
 #include <QString>
-#include "svcgmpserver_export.h"
+#include "gmp_export.h"

 namespace NGL
 {
@@ -13,7 +13,7 @@
 namespace MeteoDataManagement
 {
 DdsHandler::DdsHandler(int domainId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHa
                                                     QObject *parent) : QObject(parent)
  , m_ddsHandler(ddsHandler)
  , m_handlerMeteoDataUnits(handlerMeteoDataUnits),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -23,7 +23,7 @@ HandlerMeteoDataUnit::HandlerMeteoDataUnit(MainHandler *mainHandler,
  , m_mainHandler(mainHandler)
  , m_asset(asset)
  , m_tcpWS(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  init();
 } // end of ctor()
 //-----------------------------------------------------------------------------
@@ -15,7 +15,7 @@ namespace MeteoDataManagement
 {

 HandlerMeteoDataUnits::HandlerMeteoDataUnits(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -22,7 +22,7 @@ MainHandler::MainHandler() : m_ddsHandler(nullptr)
  , m_handlerInfrastructureData(nullptr)
  , m_handlerStaticMeteoData(nullptr)
  , m_gnaService(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()
 //-----------------------------------------------------------------------------

@@ -32,7 +32,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
  , m_speed(0.0)
  , m_climateOk(false)
  , m_windOk(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  INFO_LOG(m_logger) << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
                     << " climatePort: " << m_climatePort
                     << " windPort: " << m_windPort;
@@ -15,7 +15,7 @@ namespace NmeaManagement
 {

 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -128,7 +128,7 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle

 // ####### ServicesInformation begin #######
 ErrorMessage::ErrorMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void ErrorMessage::process()
 {
@@ -20,7 +20,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_handlerWebSocket(nullptr)
  , m_scmDtc(nullptr)
  , m_scmFtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -19,7 +19,7 @@ PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent) :
  , m_socket(new QTcpSocket(this))
  , m_readTimeout(new QTimer(this))
  , m_sizeToDownload(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "PdfDownloadSocket::PdfDownloadSocket";
  connect(m_socket, &QTcpSocket::connected, this, &PdfDownloadSocket::connected);
  connect(m_socket, &QTcpSocket::readyRead, this, &PdfDownloadSocket::readyRead);
@@ -29,7 +29,7 @@ PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfList
  , m_exTblGen(new DBAdministration::ExerciseTableGenerator(getLogger("ExerciseTableGenerator"), NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml")), this))
  , m_downloadCount(0)
  , m_totalDownloads(pdfInfoVec.size()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_socket, &PdfDownloadSocket::downloadFinished,
          this, &PdfDownloader::onSingleDownloadFinished);
 }
@@ -17,7 +17,7 @@ namespace OcSituationClient
 {

 CentralAesByteReader::CentralAesByteReader(const QByteArray &data) : m_data(data),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool CentralAesByteReader::getRemoveMessage(size_t &pos, CentralAesByteReader::RemoveMessage &removeMessage) const
 {
@@ -35,7 +35,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_tabFtc(nullptr)
  , m_tabocDtc(nullptr)
  , m_tabocDts(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -12,7 +12,7 @@ namespace OcSituationServer
 {

 CentralAesDataQueue::CentralAesDataQueue(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {

 }

@@ -32,7 +32,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_ppmFtc(nullptr)
  , m_tabDtc(nullptr)
  , m_tabFtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -19,7 +19,7 @@ PositionConverter::PositionConverter(MainHandler *m_mainHandler) : m_mainHandler
  , m_baseCoord(LtsCoordTrans::UtmCoordinate())
  , m_asmDtc(AssetManagement::Interface::Dtc::create(m_mainHandler->dds()->dds()))
  , m_exmDtc(ExerciseManagement::Interface::Dtc::create(m_mainHandler->dds()->dds())),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_exmDtc->enableExercise();
  m_asmDtc->enableTrainingArea();
 }
@@ -52,7 +52,7 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle

 // ####### BaseDlRequest begin #######
 BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid) : ClientMessage(dataManager, client, type, typeId, uuid),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void BaseDlRequest::process()
 {
@@ -26,7 +26,7 @@ UnitPositionCalculator::UnitPositionCalculator(ParticipantHandler *participantHa
  , m_bSomethingChangedSinceLastCalculation(false)
  , m_timer(new QTimer(this))
  , m_bRunning(true),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_timer, &QTimer::timeout, this, &UnitPositionCalculator::calculate);
  m_timer->setSingleShot(true);

@@ -109,7 +109,7 @@ std::vector<ShootbackArea> vecfromJson(const QJsonValue &val)


 ObjectTargetInformation::ObjectTargetInformation(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -22,7 +22,7 @@ ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandl
  , m_ddsHandler(ddsHandler)
  , m_db(db)
  , m_missionplan(missionPlan),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();

 }
@@ -18,7 +18,7 @@ namespace ParticipantManagement
 {

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -17,7 +17,7 @@ namespace PresentationManagement
 {
 //----------------------------------------------------------------------------------------------------
 ObjectPresentation::ObjectPresentation(Initialization *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 ObjectPresentation::ObjectPresentation(const Presentation &data, Initialization *mainHandler)
@@ -21,7 +21,7 @@ PdmTests::PdmTests(QObject *parent) : QObject(parent)
  , m_id(0)
  , m_testId(0)
  , m_bTestsSuccessful(true),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
 }

@@ -28,7 +28,7 @@ DbWriter::DbWriter(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnect
  , m_ddsConnector(ddsConnector)
  , m_dbWriterSnapshot(nullptr)
  , m_dbWriterSnapshotThread(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 DbWriter::~DbWriter()
 {
@@ -41,7 +41,7 @@ DbWriterSnapshot::DbWriterSnapshot(const QVector<RecordReplay::RecordReplayPlugi
  , m_snapshotInterval(1 * 60 * 1000) // TODO: make config variable   // Interval: 1 min in milliseconds
  , m_exerciseId(exerciseId)
  , m_settings(settings),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 DbWriterSnapshot::~DbWriterSnapshot()
@@ -20,7 +20,7 @@ using namespace ReportManagement;
 HandlerDynamicParticipantData::HandlerDynamicParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler,
                                                             const std::shared_ptr<DatabaseInterface> &db) : m_ddsHandler(ddsHandler)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 } // end of ctor()

 //-----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr)
  , m_dbHandler(nullptr)
  , m_dynPartData(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -22,7 +22,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr)
  , m_dbHandler(nullptr)
  , m_preService(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -23,7 +23,7 @@ ObjectReportInfo::ObjectReportInfo(const std::shared_ptr<DdsHandler> &ddsHandler
                                   QObject *parent) : QObject(parent)
  , m_ddsHandler(ddsHandler)
  , m_db(db),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 //------------------------------------------------------------------------------