Zapped RCSID

85 files changed, 123 insertions, 453 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index a0ecca3713b..f267d3c6546 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -9,10 +9,6 @@
 #include "orbsvcs/Event_Utilities.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (orbsvcs,
-           Event_Utilities,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ConsumerQOS_Factory::
@@ -185,7 +181,7 @@ ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid,
                                  u_int ncalls)
 {
   CORBA::ULong l = this->qos_.publications.length ();
-  
+
   // @@ TODO We may want to consider more efficient growing
   // strategies here, for example, duplicating the size of the
   // buffer, or growing in fixed sized chunks...
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 8ba5df3f778..a95b5e934b2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/PortableGroup/GOA.h"
-
-ACE_RCSID (PortableGroup,
-           GOA,
-           "$Id$")
+// $Id$
 
+#include "orbsvcs/PortableGroup/GOA.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index ac2bbec66cf..aad6e727273 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,13 +1,11 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/MIOP.h"
 #include "orbsvcs/PortableGroup/UIPMC_Factory.h"
 #include "ace/Service_Config.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
 #include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index a7f6649c96c..eb8926d3d3b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-
-ACE_RCSID (PortableGroup,
-           PG_Default_Property_Validator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 0cd2d3e3fb4..6b0647da9a7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_MemberInfo.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
@@ -9,11 +11,6 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (PortableGroup,
-           PG_GenericFactory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_GenericFactory::TAO_PG_GenericFactory (
@@ -306,7 +303,7 @@ TAO_PG_GenericFactory::delete_member (
               }
               catch (const CORBA::Exception& ex)
               {
-                 // Common failure is CORBA::TRANSIENT due to remote factory 
+                 // Common failure is CORBA::TRANSIENT due to remote factory
                  // is shutdown.
                  // We just ignore the exception and continue.
                  if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index dbcc166adf9..fc10e0bb552 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -17,11 +17,6 @@
 #include "orbsvcs/PortableGroup/PG_Object_Group.h"
 #include <orbsvcs/PortableGroup/PG_Utils.h>
 
-ACE_RCSID (PortableGroup,
-           PG_Group_Factory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Group_Factory::PG_Group_Factory ()
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index ce526f75c30..575362b9f4a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,14 +1,11 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Group_Guard.h"
 
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 
 
-ACE_RCSID (PortableGroup,
-           PG_Group_Guard,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Group_Guard::TAO_PG_Group_Guard (
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
index 2fc8e11dadc..297498d0f5a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Location_Equal_To,
-           "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
 #endif  /* !__ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
index 0197726bfe8..041dcd7e9bf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/PortableGroup/PG_Location_Hash.h"
@@ -8,6 +7,3 @@
 #include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableGroup,
-           PG_Location_Hash,
-           "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index 74de3930c4d..de149f4b401 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_MemberInfo.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (PortableGroup,
-           PG_MemberInfo,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index ea6a1a9b6ab..e658eb7d75b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
-
+// $Id$
 
-ACE_RCSID (PortableGroup,
-           PG_Null_Property_Validator,
-           "$Id$")
+#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 2825fe51ec1..54fefd1592b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
 #include "orbsvcs/PortableGroup/PG_GenericFactory.h"
 #include "orbsvcs/PortableGroup/PG_conf.h"
@@ -9,11 +11,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Reverse_Lock_T.h"
 
-ACE_RCSID (PortableGroup,
-           PG_ObjectGroupManager,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void)
@@ -222,7 +219,7 @@ TAO_PG_ObjectGroupManager::remove_member (
 
   if (to_be_removed == -1)
     throw PortableGroup::ObjectGroupNotFound ();
- 
+
   // remove the element from the array and resize the array.
   const size_t groups_len = groups->size ();
   size_t j;
@@ -779,7 +776,7 @@ TAO_PG_ObjectGroupManager::member_count (
     bool is_alive)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
-  
+
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid, group_entry) != 0)
     throw PortableGroup::ObjectGroupNotFound ();
@@ -788,13 +785,13 @@ TAO_PG_ObjectGroupManager::member_count (
   TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
 
   TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
-  
+
   for (TAO_PG_MemberInfo_Set::iterator i = member_infos.begin ();
        i != end;
        ++i)
   {
     if ((*i).is_alive == is_alive)
-    { 
+    {
       ++count;
     }
   }
@@ -809,7 +806,7 @@ TAO_PG_ObjectGroupManager::is_alive (
     CORBA::Object_ptr member)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
-  
+
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid, group_entry) != 0)
     throw PortableGroup::ObjectGroupNotFound ();
@@ -817,25 +814,25 @@ TAO_PG_ObjectGroupManager::is_alive (
   TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos;
 
   TAO_PG_MemberInfo_Set::iterator end = member_infos.end ();
-  
+
   for (TAO_PG_MemberInfo_Set::iterator i = member_infos.begin ();
        i != end;
        ++i)
   {
     if ((*i).member->_is_equivalent (member))
-    { 
+    {
       return (*i).is_alive;
     }
   }
 
-  throw PortableGroup::MemberNotFound (); 
+  throw PortableGroup::MemberNotFound ();
 }
 
 
 void TAO_PG_ObjectGroupManager::remove_inactive_members ()
 {
   TAO_PG_MemberInfo_Set inactive_members;
-  
+
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
     inactive_members = this->inactive_members_;
@@ -884,13 +881,13 @@ TAO_PG_ObjectGroupManager::get_members (bool is_alive)
 }
 
 void
-TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb, 
+TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb,
                                              const TimeBase::TimeT& timeout)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members start\n")));
-    
+
   /// Get list of active member info.
   TAO_PG_MemberInfo_Set active_members = this->get_members (true);
 
@@ -934,24 +931,24 @@ TAO_PG_ObjectGroupManager::validate_members (CORBA::ORB_ptr orb,
   }
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t)TAO_PG_ObjectGroupManager::validate_members end\n")));
 }
 
 bool
-TAO_PG_ObjectGroupManager::ping (CORBA::ORB_ptr orb, 
-                                 CORBA::Object_var& obj, 
+TAO_PG_ObjectGroupManager::ping (CORBA::ORB_ptr orb,
+                                 CORBA::Object_var& obj,
                                  const TimeBase::TimeT& tt)
 {
   bool status = true;
   if (CORBA::is_nil (obj.in ()))
     throw CORBA::OBJECT_NOT_EXIST ();
-  
+
   // The ping() is used by LoadBalancer which may use RW strategy.
   // The validate thread invokes the _non_existent call to members
   // sequencially. We have to put a timeout on the call in case
   // the client side is not processing ORB requests at this time.
-  // In the event that the timeout exception occurs, we will assume 
+  // In the event that the timeout exception occurs, we will assume
   // that the peer is still around.  If we get any other exception
   // we will say that the member is not available anymore.
   TimeBase::TimeT timeout = tt;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index f8545615ad6..8dffab00f89 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -6,10 +6,6 @@
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (TAO_PortableGroup,
-           PG_Object_Adapter_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 6436536b524..cd286bb9948 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -16,11 +16,6 @@
 #include "tao/debug.h"
 #include <ace/OS_NS_stdio.h>
 
-ACE_RCSID (PortableGroup,
-           PG_Object_Group_Manipulator,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Object_Group_Manipulator::PG_Object_Group_Manipulator ()
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index 9513dc724bb..b1e5cf40dad 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Operators,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index bda9edab8c9..e74a5d11f27 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/PortableGroup/PG_PropertyManager.h"
 #include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
@@ -8,10 +9,6 @@
 
 #include "ace/SString.h"
 
-ACE_RCSID (PortableGroup,
-           PG_PropertyManager,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_PropertyManager::TAO_PG_PropertyManager (
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 897facce517..56f9c43973e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Property_Utils.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 
-ACE_RCSID (PortableGroup,
-           PG_Property_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 1eb65a2faf7..2b66804cf46 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -3,10 +3,6 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 #include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
 
-ACE_RCSID(PortableGroup,
-          PG_Servant_Dispatcher,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index a57079ffea8..5d7a25aaa63 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/PortableGroup/PG_Utils.h"
 
 #include "tao/MProfile.h"
@@ -8,11 +10,6 @@
 
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (PortableGroup,
-           PG_Utils,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index e14b009500d..612d7574bc2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -11,10 +11,6 @@
 #include "tao/Leader_Follower.h"
 #include "tao/SystemException.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Acceptor_Registry,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 21af9105f43..493ac22733e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -7,11 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Loader,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 2b41c002875..8d134432c58 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -8,10 +8,6 @@
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/debug.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_ORBInitializer,
-           "$Id$")
-
 static const char pg_poa_factory_name[] = "TAO_GOA";
 static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 8909696e8b4..d23f4f3366c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -7,10 +7,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (PortableGroup,
-           PortableGroup_Request_Dispatcher,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 6edab1cdea8..a51cb373bff 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -5,10 +5,6 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
 
-ACE_RCSID (PortableGroup,
-           Portable_Group_Map,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 8edd78de92b..818ee4c1eb8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -1,5 +1,4 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 #include "orbsvcs/PortableGroup/UIPMC_Profile.h"
@@ -18,10 +17,6 @@
 #include "orbsvcs/PortableGroup/UIPMC_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 2b28cb7716f..70b68065b90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -1,5 +1,4 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
 
@@ -18,11 +17,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-
-ACE_RCSID(PortableGroup,
-          UIPMC_Connection_Handler,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index a606d5a4770..212f03bc30e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -13,9 +13,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Connector, "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Connector::TAO_UIPMC_Connector (void)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index c427ebec59d..54974a7fc9a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -10,11 +10,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-ACE_RCSID (tao,
-           UIPMC_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/PortableGroup/UIPMC_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index f15e8375597..b7791358d93 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -6,10 +6,6 @@
 #include "ace/OS_NS_strings.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Factory,
-           "$Id$")
-
 static const char the_prefix[] = "uipmc";
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
index f9af18c659e..dc4dc4b0de4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
@@ -1,8 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
-//
 // $Id$
 
-
 #include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h"
 #include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
 
@@ -18,11 +16,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
-
-ACE_RCSID(PortableGroup,
-          UIPMC_Mcast_Connection_Handler,
-          "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_UIPMC_Mcast_Connection_Handler::TAO_UIPMC_Mcast_Connection_Handler (
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 7a6210bcb95..39dc67a35bc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -12,10 +12,6 @@
 #include "orbsvcs/miopC.h"
 #include "orbsvcs/PortableGroupC.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Profile,
-           "$Id$")
-
 static const char the_prefix[] = "miop";
 
 // UIPMC doesn't support object keys, so send profiles by default in the GIOP 1.2 target
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 0668f01185b..82dfde4bbe9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -20,10 +20,6 @@
 #include "tao/Resume_Handle.h"
 #include "tao/GIOP_Message_Base.h"
 
-ACE_RCSID (PortableGroup,
-           UIPMC_Transport,
-           "$Id$")
-
 // Local MIOP Definitions:
 
 // Note: We currently support packet fragmentation on transmit, but
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index badd9295d96..375cd3450d1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,13 +1,9 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
+// $Id$
 
+#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 931390e9573..1e7a4804c0f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
@@ -6,12 +8,6 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Connection_Handler,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 5d36ff0c404..de06f704816 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
 
 #include "tao/debug.h"
@@ -12,11 +14,6 @@
 #include "tao/Transport_Descriptor_Interface.h"
 #include "ace/Strategies_T.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index 716031f3707..c722e802ca9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
 #include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Util.h"
@@ -7,11 +9,6 @@
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           IIOP_SSL_Transport,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index 89812c36e09..2392892f14b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
-
+// $Id$
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Accept_Strategy,
-           "$Id$")
+#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 2966cb4bc9e..3cb850dc6f3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 
@@ -12,11 +14,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.inl"
 #endif /* __ACE_INLINE__ */
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Acceptor,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index caf7948dc48..1f8364db77a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -3,12 +3,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_ClientCredentials,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::ClientCredentials::ClientCredentials (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 5a1ad3a040b..6860cb8f6e6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Util.h"
@@ -18,12 +20,6 @@
 # include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Connection_Handler,
-           "$Id$")
-
-// ****************************************************************
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Connection_Handler::Connection_Handler (
@@ -92,7 +88,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
   protocol_properties.keep_alive_ =
-    this->orb_core ()->orb_params ()->sock_keepalive (); 
+    this->orb_core ()->orb_params ()->sock_keepalive ();
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
@@ -128,7 +124,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
-  //support ORBKeepalive in SSL mode 
+  //support ORBKeepalive in SSL mode
   if (protocol_properties.keep_alive_)
     {
       if (this->peer ().
@@ -140,7 +136,7 @@ TAO::SSLIOP::Connection_Handler::open (void *)
         {
           return -1;
         }
-    } 
+    }
 
   if (this->transport ()->wait_strategy ()->non_blocking ())
     {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index ed3028f69d6..a243b7df7ca 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
@@ -19,10 +21,6 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/os_include/os_netdb.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Connector,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Connector::Connector (::Security::QOP qop)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 1b6a4d0ede2..ae78b5fe44b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,15 +1,9 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
 #include "tao/ORB_Constants.h"
-
 #include "ace/SString.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Credentials,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 321c571255d..46e33cd0d63 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -13,12 +13,6 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_CredentialsAcquirer,
-           "$Id$")
-
-
 // -------------------------------------------------------
 
 #if (defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 98408532f38..07bbe863916 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -3,12 +3,6 @@
 #include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
 #include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_CredentialsAcquirerFactory,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 SecurityLevel3::CredentialsAcquirer_ptr
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index ac8e8f2694a..601bc8e52fb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,12 +1,8 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 #include "tao/debug.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Current,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index e625059d78c..fe3127bada6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,13 +1,9 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
 
 #include "ace/OS_String.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Current_Impl,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 020904b53d2..8768012be44 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
 
@@ -8,12 +9,6 @@
 #include <openssl/dh.h>
 #include "orbsvcs/SSLIOP/params_dup.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_EVP_PKEY,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ::EVP_PKEY *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index eb0685a867c..0373200cec8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
 
 #include "tao/IIOP_Endpoint.h"
@@ -8,11 +10,6 @@
 
 #include "tao/debug.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Endpoint,
-           "$Id$")
-
-
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/SSLIOP/SSLIOP_Endpoint.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index da3299661ce..07877ae6445 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Factory.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
@@ -13,11 +15,6 @@
 #include "ace/SSL/sslconf.h"
 #include "ace/SSL/SSL_Context.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Factory,
-           "$Id$")
-
-
 // An SSL session id seed value. Needs not be too unique, just somewhat
 // different. See the OpenSSL manual
 static const unsigned char session_id_context_[] =
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 066417608a3..fce8f35cd85 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
@@ -12,11 +14,6 @@
 #include <openssl/x509.h>   // @@ For debugging code below
 #endif /* SSLIOP_DEBUG_PEER_CERTIFICATE */
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Invocation_Interceptor,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index c988544f555..d36fcaddd00 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,11 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_ORBInitializer,
-           "$Id$")
-
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
 //#include "SSLIOP_IORInterceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 9aa5424db18..bd2cd76bdbd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -2,12 +2,6 @@
 
 #include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
 
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_OwnCredentials,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index a0bfb2ce2ae..f9532b3596c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,13 +1,10 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
 #include "orbsvcs/SSLIOP/ssl_endpointsC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Profile,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 6e5d711b3a7..9090daa0e77 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,9 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
-
+// $Id$
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_TargetCredentials,
-           "$Id$")
+#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index acee802653c..1e5f5c3996b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
@@ -16,11 +18,6 @@
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID (SSLIOP,
-           SSLIOP_Transport,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Transport::Transport (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index f84609e3eb3..33b43104058 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,11 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
-
-
-ACE_RCSID (SSLIOP,
-           SSLIOP_Util,
-           "$Id$")
-
+// $Id$
 
+#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
 #include "orbsvcs/SSLIOP/SSLIOP_Current.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index c36317d1a59..1f0cd227d4b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -4,11 +4,6 @@
 #include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
 #include "orbsvcs/Trader/Constraint_Tokens.h"
 
-ACE_RCSID (Trader,
-           Constraint_Interpreter,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index e6a8a444d21..d17cbab374e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Trader/Constraint_Nodes.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Trader,
-           Constraint_Nodes,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
@@ -302,7 +298,7 @@ TAO_Literal_Constraint::TAO_Literal_Constraint (void)
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
   : TAO_Constraint(),
-    type_ (TAO_UNKNOWN) 
+    type_ (TAO_UNKNOWN)
 {
   this->copy (lit);
 }
@@ -796,7 +792,7 @@ operator/ (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-        if ((CORBA::Double) right == 0.0) 
+        if ((CORBA::Double) right == 0.0)
           return TAO_Literal_Constraint ((CORBA::Double) 0.0);
 
         CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
@@ -804,7 +800,7 @@ operator/ (const TAO_Literal_Constraint& left,
       }
     case TAO_SIGNED:
       {
-        if (static_cast<CORBA::LongLong> (right) == 0) 
+        if (static_cast<CORBA::LongLong> (right) == 0)
           return TAO_Literal_Constraint (static_cast<CORBA::LongLong> (0));
 
         CORBA::LongLong result = static_cast<CORBA::LongLong> (left) /
@@ -813,7 +809,7 @@ operator/ (const TAO_Literal_Constraint& left,
       }
     case TAO_UNSIGNED:
       {
-        if (static_cast<CORBA::ULongLong> (right) == 0) 
+        if (static_cast<CORBA::ULongLong> (right) == 0)
           return TAO_Literal_Constraint (static_cast<CORBA::ULongLong> (0));
 
         CORBA::ULongLong result = static_cast<CORBA::ULongLong> (left) /
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index bdc558cdd52..fe308c0373a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,15 +1,8 @@
 // $Id$
 
 #include "orbsvcs/Trader/Service_Type_Repository.h"
-
 #include "ace/Lock_Adapter_T.h"
 
-
-ACE_RCSID (Trader,
-           Service_Type_Repository,
-           "$Id$")
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 7b0ab0b58de..a98f86cced7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -11,10 +11,6 @@
 // The following #include is needed only for the instantiation pragmas.
 #include "orbsvcs/Trader/Trader_Interfaces.h"
 
-ACE_RCSID (Trader,
-           Trader,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Trader_Base::TAO_Trader_Base (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 11e43114d84..18cb0855e21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -8,10 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ping_ior = ACE_TEXT ("file://ping.ior");
 const ACE_TCHAR *pong_ior = ACE_TEXT ("file://pong.ior");
 const ACE_TCHAR *ping_address = ACE_TEXT ("localhost:12345");
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 2f339f6f4f8..16abbbd567a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -9,10 +9,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("ping.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index d029d1648bb..b72c8435695 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -11,10 +11,6 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-ACE_RCSID (Latency,
-           ping,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("pong.ior");
 const char *protocol = "RTP/UDP";
 int milliseconds = 100;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index d009ae9a5ab..eacb684044c 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 6b6bf38037b..c99cccd2b1e 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 7dd4cec52fe..74d342ba8ab 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -15,10 +16,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "tao/PI/PIForwardRequestC.h"
 
-ACE_RCSID (FaultTolerance,
-           ServerRequest_Interceptor2,
-           "$Id$")
-
 CORBA::Boolean
 ServerRequest_Interceptor2::has_ft_request_sc_ = false;
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index a1206b32b29..4e11820362c 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "Hello.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior.ior");
 const ACE_TCHAR *iogr_output_file = ACE_TEXT("iogr.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 4306f129fe2..6f9554e3515 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequest_Interceptor2.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -17,10 +18,6 @@
 
 int invocation_count = 0;
 
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
 TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
 : orb_ (0),
   expired_ (0)
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index a321f4d6d21..7816eaf6233 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -13,10 +13,6 @@
 // Make sure this file is included to avoid permanent forward problems in win32.
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 
@@ -54,7 +50,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
   iors.length(1);
   iors [0] = CORBA::Object::_duplicate (ref);
-    
+
   CORBA::Object_var new_ref =
     iorm->merge_iors (iors );
 
@@ -130,34 +126,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
-      
-      
+
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
                                                );
-      
+
 
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
                                           );
-      
+
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
                               policies
                               );
-      
+
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-          
+
         }
 
 
@@ -169,29 +165,29 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                       Hello (orb.in (), Test::Hello::_nil ()),
                       1);
       PortableServer::ServantBase_var holder (hello_impl);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
                                        hello_impl
                                        );
-      
+
 
       CORBA::Object_var hello =
         my_poa->id_to_reference (server_id.in () );
-      
-      
+
+
       CORBA::String_var ior =
         orb->object_to_string (hello.in () );
-      
-      
+
+
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                          0
                                          );
-      
+
 
       // Narrow
       iorm =
@@ -199,14 +195,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       CORBA::Object_var iortmp =
         orb->string_to_object (ior.in ());
-      
+
       CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, iortmp.in ());
-      
-      
+
+
       CORBA::String_var iorgr_string =
         orb->object_to_string (iogr.in () );
-      
-      
+
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -218,17 +214,17 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_OS::fclose (output_file);
 
       temp_initializer->set_server_iogr (iogr.in ());
-          
+
       poa_manager->activate ();
-      
+
 
       orb->run ();
-      
+
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 );
-      
+
 
       orb->destroy ();
     }
@@ -238,7 +234,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "Exception caught:");
       return 1;
     }
-  
+
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
index 124ac3c41bb..ad01818d727 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "tao/corba.h"
 #include "ace/ARGV.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tests,
-           server,
-           "$Id$")
-
 // SSLIOP
 const ACE_TCHAR argStrB[] = ACE_TEXT("BBB -ORBGestalt LOCAL -ORBId ORB-B -ORBSvcConf b.conf");
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index ea8cf35a225..a04a418f5df 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -26,12 +26,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID (Concurrency,
-           CC_command,
-           "$Id$")
-
-
 CC_Command::~CC_Command(void)
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 26d765f6145..d651ccb46aa 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -14,10 +14,6 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer,
-           "$Id$")
-
 Test_Consumer::Test_Consumer (ECT_Driver *driver,
                               void *cookie,
                               int n_suppliers,
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 0694c7b8b5c..95b06fd8819 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -16,10 +16,6 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Consumer_Driver,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 267d2cd920f..79aff223718 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -21,10 +21,6 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (EC_Throughput,
-           ECT_Throughput,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index 9dea6f91d01..fe9454b050f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -1,12 +1,9 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_ORBInitializer.h"
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_ORBInitializer,
-           "$Id$")
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "Server_Request_Interceptor.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 496a3d40a98..053d4054198 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
@@ -7,10 +8,6 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-ACE_RCSID (ForwardRequest,
-           Server_Request_Interceptor,
-           "$Id$")
-
 static const CORBA::ULong expected_version = 5;
 
 Server_Request_Interceptor::Server_Request_Interceptor (void)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 6b8b91aa288..b10636850e8 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "testC.h"
@@ -6,10 +7,6 @@
 #include "tao/PI/PI.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
-ACE_RCSID (Group_Ref_Manip,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = 0;
 
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 9e33bcc9650..428c66100ee 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -14,10 +15,6 @@
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
-ACE_RCSID (ForwardRequest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_file = 0;
 
 int
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index b25a7d02ce9..a845f0270e1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "test_i.h"
 
-ACE_RCSID (ForwardRequest,
-           test_i,
-           "$Id$")
-
 test_i::test_i (CORBA::Short num,
                 CORBA::ORB_ptr orb)
   : number_ (num),
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 45141f4d2c3..098defd0b3d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -21,10 +21,6 @@
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 
-ACE_RCSID(IOGRManipluation,
-          IOGRTest,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 1cbdb689a45..dd1428179db 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -5,10 +5,6 @@
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (FtRtEvent,
-           PushConsumer,
-           "$Id$")
-
 PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 693fe30f472..1be4464c3b5 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -9,10 +9,6 @@
 #include "tao/Stub.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 
-ACE_RCSID (FtRtEvent,
-           PushSupplier,
-           "$Id$")
-
 int
 PushSupplier_impl::ReactorTask::svc (void)
 {
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 7992c1dbe64..6468abf3045 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -15,10 +15,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           consumer,
-           "$Id$")
-
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index a17ddeb4ba1..1a65a4eb197 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -14,10 +14,6 @@
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
 
-ACE_RCSID (FtRtEvent,
-           supplier,
-           "$Id$")
-
 ACE_Time_Value timer_interval(1,0);
 CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index d3dda03a311..8726ac155a7 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -11,10 +11,6 @@
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
-ACE_RCSID (Sched_Conf,
-           Sched_Conf,
-           "$Id$")
-
 const ACE_TCHAR *service_name = ACE_TEXT("ScheduleService");
 
 const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, "