ChangeLogTag: Fri Apr 12 22:41:43 UTC 2013 Adam Mitz <mitza@ociweb.com>

14 files changed, 42 insertions, 26 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 48efde46c4a..928cb376771 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
+#include "orbsvcs/Log_Macros.h"
 #include "ace/INET_Addr.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -18,11 +20,11 @@ int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 
   if (reactor_->register_handler (this,
     ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ORBSVCS_ERROR_RETURN ((LM_ERROR,
     "(%P|%t) can't register with reactor\n"),
     -1);
 
-  ACE_DEBUG ((LM_DEBUG,
+  ORBSVCS_DEBUG ((LM_DEBUG,
     "(%P|%t) connected with %s\n",
     addr.get_host_name ()));
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index a1edbc382df..fe440c891cf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
@@ -25,7 +26,7 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
 {
-  ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
+  ORBSVCS_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
   return obtain_proxy();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 2bb5c55df40..7e7121b0c88 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ace/Dynamic_Service.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
@@ -50,7 +51,7 @@ void setup_object_group(TAO_FTEC_Event_Channel* es,
           resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context,
             FTRTEC::Identification_Service::instance()->name());
 
-        ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n"));
+        ORBSVCS_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n"));
 
         primary->join_group(member_list[0]);
       }
@@ -67,7 +68,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership)
     detector_loader->init(0, 0);
 
     if (FTRTEC::Identification_Service::instance() == 0)
-      ACE_ERROR_RETURN((LM_ERROR, "No Identification\n"), 0);
+      ORBSVCS_ERROR_RETURN((LM_ERROR, "No Identification\n"), 0);
 
     // initialize naming_contex
     CosNaming::NamingContext_var naming_context
@@ -164,7 +165,7 @@ TAO_FTEC_Event_Channel::for_suppliers (void)
 void
 TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
 {
-  ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n"));
+  ORBSVCS_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n"));
   ec_impl_->set_state(s);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 35748435acc..a05cebc669f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -1,5 +1,6 @@
 // // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
@@ -27,11 +28,11 @@ int find_by_location(const FTRT::ManagerInfoList& list,
 /*
 void print(const FTRT::Location& location)
 {
-  ACE_DEBUG((LM_DEBUG, "{"));
+  ORBSVCS_DEBUG((LM_DEBUG, "{"));
   for (size_t i = 0; i < location.length(); ++i) {
-    ACE_DEBUG((LM_DEBUG, "<%s,%s>", location[i].id.in(), location[i].kind.in()));
+    ORBSVCS_DEBUG((LM_DEBUG, "<%s,%s>", location[i].id.in(), location[i].kind.in()));
   }
-  ACE_DEBUG((LM_DEBUG, "}"));
+  ORBSVCS_DEBUG((LM_DEBUG, "}"));
 }
 */
 
@@ -86,7 +87,7 @@ void TAO_FTEC_Group_Manager::create_group (
   if (impl_->my_position > 0) {
     Fault_Detector* detector = Fault_Detector::instance();
     if ( detector->connect(impl_->info_list[impl_->my_position-1].the_location) == -1) {
-      ACE_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n"));
+      ORBSVCS_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n"));
       throw FTRT::PredecessorUnreachable();
     }
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index 6eb812a3fc9..f7829740eea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ace/Reactor.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
 #include "ace/Select_Reactor.h"
@@ -46,7 +47,7 @@ int Fault_Detector::init(int argc, ACE_TCHAR** argv)
   {
     if (!reactor_task_.thr_count() &&
       reactor_task_.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-      ACE_ERROR_RETURN ((LM_ERROR,"Cannot activate reactor thread\n"),
+      ORBSVCS_ERROR_RETURN ((LM_ERROR,"Cannot activate reactor thread\n"),
       -1);
     return 0;
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 657d30f0c9d..7a7e9b870df 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
@@ -47,7 +48,7 @@ namespace FTRTEC {
 #if (TAO_HAS_SCIOP == 1)
       ACE_auto_ptr_reset(detector_, detector);
 #else
-      ACE_DEBUG ((LM_DEBUG,
+      ORBSVCS_DEBUG ((LM_DEBUG,
                   "(%P|%t) SCTP not enabled. ",
                   " Enable SCTP and rebuild ACE+TAO\n"));
 #endif /* TAO_HAS_SCIOP */
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index c7f814cc070..2760efbcee2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
+#include "orbsvcs/Log_Macros.h"
 #include "ace/INET_Addr.h"
 #include "ace/os_include/os_netdb.h"
 
@@ -22,12 +24,12 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor()
 {
   typename CONNECTOR::PEER_ADDR listen_addr;
   if (acceptor_.open(listen_addr, &reactor_task_.reactor_) != 0)
-    ACE_ERROR_RETURN((LM_ERROR, "Connot open acceptor\n"), -1);
+    ORBSVCS_ERROR_RETURN((LM_ERROR, "Connot open acceptor\n"), -1);
 
   if (acceptor_.acceptor().get_local_addr(listen_addr) !=0)
-    ACE_ERROR_RETURN((LM_ERROR, "Connot get local addr\n"), -1);
+    ORBSVCS_ERROR_RETURN((LM_ERROR, "Connot get local addr\n"), -1);
 
-  ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(),
+  ORBSVCS_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(),
                                                listen_addr.get_port_number()));
   ACE_TCHAR tcharbuf [MAXHOSTNAMELEN];
   listen_addr.addr_to_string(tcharbuf, MAXHOSTNAMELEN, 0);
@@ -50,7 +52,7 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::connect(const FTRT::Lo
     ACE_NEW_RETURN(handler, DETECTION_HANDLER(listener_), 0) ;
 
     handler->reactor(&reactor_task_.reactor_);
-    ACE_DEBUG((LM_DEBUG, "connecting to %s\n", location[0].id.in()));
+    ORBSVCS_DEBUG((LM_DEBUG, "connecting to %s\n", location[0].id.in()));
 
     int result = connector_.connect(handler->peer(), prev_addr);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index 06fe24e6903..a7543bc8a0d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
 #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
@@ -152,7 +153,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
     maker->get_ref_version(), version);
 
   if (version < maker->get_ref_version()) {
-    ACE_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n"));
+    ORBSVCS_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n"));
 
     try{
       CORBA::Object_var forward = get_forward(ri);
@@ -187,7 +188,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
 
       ri->add_reply_service_context (sc, 0);
 
-      ACE_DEBUG((LM_DEBUG, "reply_service_context added\n"));
+      ORBSVCS_DEBUG((LM_DEBUG, "reply_service_context added\n"));
     }
     catch (...){
     }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 4793489d99f..eef8424fbdd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,4 +1,5 @@
 // $Id$
+#include "orbsvcs/Log_Macros.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -110,7 +111,7 @@ get_transaction_depth_context(
   }
   catch (const CORBA::BAD_PARAM&)
   {
-    ACE_DEBUG((LM_DEBUG, "Received request without transaction depth context\n"));
+    ORBSVCS_DEBUG((LM_DEBUG, "Received request without transaction depth context\n"));
     return -1;
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 085b909aebc..4562cb95160 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
 #include "../Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
@@ -82,7 +83,7 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   result->iogr =
     ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
 
-  ACE_DEBUG((LM_DEBUG, "In setup_info\n"));
+  ORBSVCS_DEBUG((LM_DEBUG, "In setup_info\n"));
   //log_obj_endpoints(result->iogr.in());
 
   /// check if sucessor changed
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index ff3188b6ba6..9c82cab7c45 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -207,7 +208,7 @@ IOGR_Maker::set_ref_version(CORBA::ULong version)
 CORBA::ULong
 IOGR_Maker::increment_ref_version()
 {
-  ACE_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_.            object_group_ref_version+1));
+  ORBSVCS_DEBUG((LM_DEBUG, "new object_group_ref_version = %d\n", ft_tag_component_.            object_group_ref_version+1));
   return ++ft_tag_component_.object_group_ref_version;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 16e3a70b34b..15b46f005a0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
 #include "../Utils/UUID.h"
 #include "ace/OS_NS_strings.h"
@@ -41,7 +42,7 @@ namespace FTRTEC {
         else if (argv[0][0] != '$') {
           TAO_FtRt::UUID uuid(argv[0]);
           if (!uuid.is_valid())
-            ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1);
+            ORBSVCS_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1);
           object_id_.length(16);
           uuid.to_binary(&object_id_[0]);
         }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 2ca0edfa40d..3bc8ec8ed10 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/IOPA.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
@@ -94,7 +95,7 @@ TAO_Set_Update_Interceptor::send_request (
       FTRT::SequenceNumber sequence_number =
         Request_Context_Repository().get_sequence_number(ri);
 
-      ACE_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number));
+      ORBSVCS_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number));
       if (sequence_number != 0) {
         if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
           throw CORBA::MARSHAL ();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 7f34610440f..4c2d3ba285b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
 #include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
@@ -48,7 +49,7 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
   ACE_OS::memcpy(&mgr, object_id->get_buffer(), sizeof(mgr));
   ACE_OS::memcpy(&id, object_id->get_buffer()+sizeof(mgr), sizeof(id));
 
-  ACE_DEBUG((LM_DEBUG, "%d\n", id));
+  ORBSVCS_DEBUG((LM_DEBUG, "%d\n", id));
 
   (mgr->*handler)(id);
 
@@ -58,14 +59,14 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
 void UpdateableHandler::set_update (
                                     )
 {
-  ACE_DEBUG((LM_DEBUG,"Received reply from "));
+  ORBSVCS_DEBUG((LM_DEBUG,"Received reply from "));
   dispatch(&Update_Manager::handle_reply);
 }
 void UpdateableHandler::set_update_excep (
   ::Messaging::ExceptionHolder * excep_holder
   )
 {
-  ACE_DEBUG((LM_DEBUG, "Received Exception from"));
+  ORBSVCS_DEBUG((LM_DEBUG, "Received Exception from"));
   try{
     excep_holder->raise_exception();
   }