1 files changed, 57 insertions, 66 deletions

diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc
index bf2d3dbdf4..1d07e01c7a 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc
@@ -39,7 +39,7 @@
 #include "transport_manager/transport_manager_impl.h"
 
 namespace transport_manager {
-CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
+SDL_CREATE_LOG_VARIABLE("TransportManager")
 
 TransportAdapterListenerImpl::TransportAdapterListenerImpl(
     TransportManager* manager, TransportAdapter* adapter)
@@ -47,7 +47,7 @@ TransportAdapterListenerImpl::TransportAdapterListenerImpl(
 
 void TransportAdapterListenerImpl::OnSearchDeviceDone(
     const TransportAdapter* adapter) {
-  LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter);
+  SDL_LOG_TRACE("enter. adapter* " << adapter);
   const TransportAdapterEvent event(EventTypeEnum::ON_SEARCH_DONE,
                                     transport_adapter_,
                                     "",
@@ -57,15 +57,14 @@ void TransportAdapterListenerImpl::OnSearchDeviceDone(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnSearchDeviceFailed(
     const TransportAdapter* adapter, const SearchDeviceError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", error: " << &error);
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", error: " << &error);
   SearchDeviceError* err = new SearchDeviceError(error);
   const TransportAdapterEvent event(EventTypeEnum::ON_SEARCH_FAIL,
                                     transport_adapter_,
@@ -76,14 +75,14 @@ void TransportAdapterListenerImpl::OnSearchDeviceFailed(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDeviceListUpdated(
     const TransportAdapter* adapter) {
-  LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter);
+  SDL_LOG_TRACE("enter. adapter* " << adapter);
   const TransportAdapterEvent event(EventTypeEnum::ON_DEVICE_LIST_UPDATED,
                                     transport_adapter_,
                                     "",
@@ -93,14 +92,14 @@ void TransportAdapterListenerImpl::OnDeviceListUpdated(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnFindNewApplicationsRequest(
     const TransportAdapter* adapter) {
-  LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter);
+  SDL_LOG_TRACE("enter. adapter* " << adapter);
   const TransportAdapterEvent event(
       EventTypeEnum::ON_FIND_NEW_APPLICATIONS_REQUEST,
       transport_adapter_,
@@ -111,14 +110,14 @@ void TransportAdapterListenerImpl::OnFindNewApplicationsRequest(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnConnectionStatusUpdated(
     const TransportAdapter* adapter) {
-  LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter);
+  SDL_LOG_TRACE("enter. adapter* " << adapter);
   const TransportAdapterEvent event(EventTypeEnum::ON_CONNECTION_STATUS_UPDATED,
                                     transport_adapter_,
                                     "",
@@ -128,17 +127,16 @@ void TransportAdapterListenerImpl::OnConnectionStatusUpdated(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnConnectPending(
     const TransportAdapter* adapter,
     const DeviceUID& device,
     const ApplicationHandle& application_id) {
-  LOG4CXX_TRACE(logger_,
-                "enter adapter*: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter adapter*: " << adapter << ", device: " << &device
                                    << ", application_id: " << &application_id);
   const TransportAdapterEvent event(EventTypeEnum::ON_CONNECT_PENDING,
                                     transport_adapter_,
@@ -149,17 +147,16 @@ void TransportAdapterListenerImpl::OnConnectPending(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnConnectDone(
     const TransportAdapter* adapter,
     const DeviceUID& device,
     const ApplicationHandle& application_id) {
-  LOG4CXX_TRACE(logger_,
-                "enter adapter*: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter adapter*: " << adapter << ", device: " << &device
                                    << ", application_id: " << &application_id);
   const TransportAdapterEvent event(EventTypeEnum::ON_CONNECT_DONE,
                                     transport_adapter_,
@@ -170,9 +167,9 @@ void TransportAdapterListenerImpl::OnConnectDone(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnConnectFailed(
@@ -180,8 +177,7 @@ void TransportAdapterListenerImpl::OnConnectFailed(
     const DeviceUID& device,
     const ApplicationHandle& app_id,
     const ConnectError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", error: " << &error);
   ConnectError* err = new ConnectError(error);
@@ -194,17 +190,17 @@ void TransportAdapterListenerImpl::OnConnectFailed(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDisconnectDone(
     const TransportAdapter* adapter,
     const DeviceUID& device,
     const ApplicationHandle& app_id) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_AUTO_TRACE();
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id);
   const TransportAdapterEvent event(EventTypeEnum::ON_DISCONNECT_DONE,
                                     transport_adapter_,
@@ -215,9 +211,9 @@ void TransportAdapterListenerImpl::OnDisconnectDone(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDisconnectFailed(
@@ -225,8 +221,7 @@ void TransportAdapterListenerImpl::OnDisconnectFailed(
     const DeviceUID& device,
     const ApplicationHandle& app_id,
     const DisconnectError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", error: " << &error);
   DisconnectError* err = new DisconnectError(error);
@@ -239,13 +234,15 @@ void TransportAdapterListenerImpl::OnDisconnectFailed(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDisconnectDeviceDone(
-    const TransportAdapter* adapter, const DeviceUID& device) {}
+    const TransportAdapter* adapter, const DeviceUID& device) {
+  SDL_LOG_AUTO_TRACE();
+}
 
 void TransportAdapterListenerImpl::OnDisconnectDeviceFailed(
     const TransportAdapter* adapter,
@@ -257,8 +254,7 @@ void TransportAdapterListenerImpl::OnDataReceiveDone(
     const DeviceUID& device,
     const ApplicationHandle& app_id,
     const ::protocol_handler::RawMessagePtr data_container) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", data_container: " << data_container);
   const TransportAdapterEvent event(EventTypeEnum::ON_RECEIVED_DONE,
@@ -270,9 +266,9 @@ void TransportAdapterListenerImpl::OnDataReceiveDone(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDataReceiveFailed(
@@ -280,8 +276,7 @@ void TransportAdapterListenerImpl::OnDataReceiveFailed(
     const DeviceUID& device,
     const ApplicationHandle& app_id,
     const DataReceiveError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", error: " << &error);
   DataReceiveError* err = new DataReceiveError(error);
@@ -294,9 +289,9 @@ void TransportAdapterListenerImpl::OnDataReceiveFailed(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDataSendDone(
@@ -304,8 +299,7 @@ void TransportAdapterListenerImpl::OnDataSendDone(
     const DeviceUID& device,
     const ApplicationHandle& app_id,
     const ::protocol_handler::RawMessagePtr data_container) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", data_container: " << data_container);
   const TransportAdapterEvent event(EventTypeEnum::ON_SEND_DONE,
@@ -317,9 +311,9 @@ void TransportAdapterListenerImpl::OnDataSendDone(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnDataSendFailed(
@@ -328,8 +322,7 @@ void TransportAdapterListenerImpl::OnDataSendFailed(
     const ApplicationHandle& app_id,
     const ::protocol_handler::RawMessagePtr data_container,
     const DataSendError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id
                                    << ", data_container: " << data_container
                                    << ", error: " << &error);
@@ -343,9 +336,9 @@ void TransportAdapterListenerImpl::OnDataSendFailed(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnConnectRequested(
@@ -358,8 +351,7 @@ void TransportAdapterListenerImpl::OnUnexpectedDisconnect(
     const DeviceUID& device,
     const ApplicationHandle& application,
     const CommunicationError& error) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application: " << &application
                                    << ", error: " << &error);
   CommunicationError* err = new CommunicationError(error);
@@ -372,17 +364,16 @@ void TransportAdapterListenerImpl::OnUnexpectedDisconnect(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnCommunicationError(
     const TransportAdapter* adapter,
     const DeviceUID& device,
     const ApplicationHandle& app_id) {
-  LOG4CXX_TRACE(logger_,
-                "enter. adapter: " << adapter << ", device: " << &device
+  SDL_LOG_TRACE("enter. adapter: " << adapter << ", device: " << &device
                                    << ", application_id: " << &app_id);
   const TransportAdapterEvent event(EventTypeEnum::ON_COMMUNICATION_ERROR,
                                     transport_adapter_,
@@ -393,14 +384,14 @@ void TransportAdapterListenerImpl::OnCommunicationError(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
-  LOG4CXX_TRACE(logger_, "exit");
+  SDL_LOG_TRACE("exit");
 }
 
 void TransportAdapterListenerImpl::OnTransportSwitchRequested(
     const transport_adapter::TransportAdapter* adapter) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
   const TransportAdapterEvent event(
       EventTypeEnum::ON_TRANSPORT_SWITCH_REQUESTED,
       transport_adapter_,
@@ -411,13 +402,13 @@ void TransportAdapterListenerImpl::OnTransportSwitchRequested(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
 }
 
 void TransportAdapterListenerImpl::OnTransportConfigUpdated(
     const transport_adapter::TransportAdapter* adapter) {
-  LOG4CXX_AUTO_TRACE(logger_);
+  SDL_LOG_AUTO_TRACE();
 
   const TransportAdapterEvent event(EventTypeEnum::ON_TRANSPORT_CONFIG_UPDATED,
                                     transport_adapter_,
@@ -429,7 +420,7 @@ void TransportAdapterListenerImpl::OnTransportConfigUpdated(
   if (transport_manager_ != NULL &&
       transport_manager::E_SUCCESS !=
           transport_manager_->ReceiveEventFromDevice(event)) {
-    LOG4CXX_WARN(logger_, "Failed to receive event from device");
+    SDL_LOG_WARN("Failed to receive event from device");
   }
 }