ChangeLogTag: Thu Jun 9 18:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 13 insertions, 68 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog b/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog
deleted file mode 100644
index b96cc14f6bc..00000000000
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Fri Sep  3 13:57:11 2004  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* FT_Endpoint_Selector_Factory.cpp:
-
-  	  Include "tao/SystemException.h" instead of "tao/Exception.h" to
-	  pull CORBA::SystemException class declaration.
-
-Thu Aug 28 07:37:49 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-	* FT_Invocation_Endpoint_Selectors.cpp:
-
-  	  Include "tao/debug.h" for TAO_debug_level global variable.
-
-Thu Jul 10 11:20:52 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* orbsvcs/orbsvcs/Makefile.FaulTolerance: Added new files.
-
-	* orbsvcs/orbsvcs/FT_CORBA_ORB.idl: Make the IDL spec compatible.
-
-Thu Jul 10 11:09:25 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
-
-	* orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
-	* orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
-	  Client side interceptor for FaultTolerance. This interceptor is
-	  now used to modify the service context list that is passed to
-	  the server side. The interceptor is setup using the standard
-	  svc.conf mechanism.
-
-	* orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp:
-	* orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h: Register the
-	  server side and client side interceptors through the
-	  initializer.
-
-	* orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp:
-	* orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: The latest specs
-	  changed the attribute in FTRequestDurationPolicy from
-	  request_duration_policy to
-	  request_duration_policy_value. Changed the accesor to match the
-	  IDL file.
-
-	* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
-	* orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h: Removed
-	  all the callback code used for processing service context
-	  information. We now interceptors to do that.
-
-	* tao/ORB_Core.h:
-	* tao/ORB_Core.cpp:
-	* tao/ORB_Core.i: Removed all the callbacks for logging and
-	  service context for FT.
-
-
-	* tao/Service_Callbacks.h:
-	* tao/Service_Callbacks.cpp: The effect of the above
-	  changes. Remove interfaces that are totally irrelevant.
-
-
-	* tao/PortableServer/ServantBase.cpp: The effect of the above change.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 822749dc676..bca168a930c 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -87,7 +87,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
       CORBA::ULong msecs =
         static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                  ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"),
                   msecs));
     }
 }
@@ -182,7 +182,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
       CORBA::ULong msecs =
         static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                  ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"),
                   msecs));
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 799d3cdff6a..18cad43830d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -84,7 +84,7 @@ namespace TAO
         ACE_CHECK;
 
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_FT (%P|%t): %s called for %s \n",
+                    ACE_TEXT ("TAO_FT (%P|%t) - %s called for %s\n"),
                     this->name_,
                     op.in ()));
       }
@@ -300,7 +300,7 @@ namespace TAO
         ftrsc.retention_id = ++this->retention_id_;
 
       //  ACE_DEBUG ((LM_DEBUG,
-      //    "(%P|%t) Retention id [%d]\n",
+      //    ACE_TEXT ("TAO_FT (%P|%t) - Retention id [%d]\n"),
       //    ftrsc.retention_id));
         tss->retention_id_ = ftrsc.retention_id;
         tss->clean_flag_ = false;
@@ -377,8 +377,8 @@ namespace TAO
         if (TAO_debug_level > 3)
           {
             ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) TAO_FT - Using default value",
-                        " of 15 seconds \n"));
+                        ACE_TEXT ("TAO_FT (%P|%t) - Using default value")
+			ACE_TEXT ("of 15 seconds\n")));
           }
         t = 15 * 1000000;
       }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 2bcd5056f58..4545579404e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -224,7 +224,7 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) TAO-FT - Got a primary component \n"));
+                  ACE_TEXT ("TAO_FT (%P|%t) - Got a primary component\n")));
     }
 
   return true;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index a99cc55c052..09f2735fd09 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -85,7 +85,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
       CORBA::ULong msecs =
         static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                  ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"),
                   msecs));
     }
 }
@@ -180,7 +180,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
       CORBA::ULong msecs =
         static_cast<CORBA::ULong> (microseconds / 1000);
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                  ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"),
                   msecs));
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 7999731214a..3fe3040dddc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -152,8 +152,10 @@ namespace TAO
         this->object_group_ref_version_)
       {
         ACE_ERROR ((LM_ERROR,
-                    "TAO-FT (%P|%t) - Wrong version information "
-                    "within the interceptor \n"));
+                    ACE_TEXT ("TAO_FT (%P|%t) - Wrong version information ")
+                    ACE_TEXT ("within the interceptor (%u > %u)\n"),
+                    fgvsc.object_group_ref_version,
+                    this->object_group_ref_version_));
       }
     else if (fgvsc.object_group_ref_version <
              this->object_group_ref_version_)