Wed Sep 8 13:14:03 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

* *.cpp: Removed RCS_ID
author: Johnny Willemsen <jwillemsen@remedy.nl> 2010-09-08 13:44:26 +0000
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2010-09-08 13:44:26 +0000
commit: fe7fd971374ebd99ca4007927e07656c89afbd2c (patch)
tree: caee2c60d8d7773b8103f50fd26ce990718abac2 /TAO
parent: 6da6a5a3ddf69472767335eb14a6dd72003d2544 (diff)
download: ATCD-fe7fd971374ebd99ca4007927e07656c89afbd2c.tar.gz
259 files changed, 54 insertions, 738 deletions
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 64b2aa35e9b..43030201209 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -19,10 +19,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 unsigned int msec = 50;
 
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 4605335adc1..1e6797ad812 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -16,10 +16,6 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (AMI,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 2f966550e93..24e41ef04df 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -9,12 +9,6 @@
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index c1d8bd1bb30..52e133d6c04 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index b93c837c726..634c0e1ec49 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 void do_nothing (void)
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index 08ee5eb5188..9c0c1b4b7f6 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index c591ab2b419..df7de9fe6bd 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -11,8 +11,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
-
 void
 Callback_i::shutdown (void)
 {
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 54f68876b18..0111c7d507d 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(BiDirectional, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 void do_nothing (void)
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 08ee5eb5188..9c0c1b4b7f6 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(BiDirectional, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int no_iterations = 10;
 
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 776ec609487..91c174281c6 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -10,8 +10,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
-
 void
 Callback_i::shutdown (void)
 {
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index 419ad646a44..c2c1d06aea0 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -3,8 +3,6 @@
 //
 #include "BlobServer.h"
 
-ACE_RCSID(BlobServerImpl, BlobServerImpl, "$Id$")
-
 BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index 0da8e0bf326..9610ee971db 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -1,8 +1,8 @@
+// $Id$
+
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp
index e69ea65aaa5..e92f8e0f94f 100644
--- a/TAO/tests/Bug_1254_Regression/server.cpp
+++ b/TAO/tests/Bug_1254_Regression/server.cpp
@@ -1,11 +1,9 @@
+// $Id$
+
 #include "BlobServer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (BlobServer,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_1269_Regression/Echo.cpp b/TAO/tests/Bug_1269_Regression/Echo.cpp
index d64dae69dce..364d723fd8e 100644
--- a/TAO/tests/Bug_1269_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo.cpp
@@ -9,8 +9,6 @@
 #include "Echo.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1269_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
index 1bc987dda57..1520b6d40a7 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "Server_Timer.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Bug_1269_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index c74d1ffc44c..bdbfb7ff9d3 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -7,8 +7,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1269_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool do_shutdown = false;
 
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index 7c1a549bec8..6281aae441c 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp
index 15a7a4c57b2..75c94693e1a 100644
--- a/TAO/tests/Bug_1270_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo.cpp
@@ -9,8 +9,6 @@
 #include "Echo.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
index 1763f53b57d..4759fa55393 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "Server_Timer.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
   : orb_(CORBA::ORB::_duplicate(orb))
 {
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
index 9890d7961e5..e75d5f6a2cd 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -10,8 +10,6 @@
 #include "ace/Reactor.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Bug_1270_Regression, Server_Timer, "$Id$")
-
 Server_Timer::Server_Timer(Test::Echo_ptr echo,
                            ACE_Reactor * reactor)
   : ACE_Event_Handler (reactor)
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 00ebb73a9b0..72b3fe2c8b8 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1270_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index 36b26f22b52..1e5608e6776 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -6,8 +6,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1270_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 893d0e85ba4..32034421864 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index bdfc3b0d967..b8035e33bf7 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -11,8 +11,6 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_signal.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo, "$Id$")
-
 Echo::Echo(CORBA::ORB_ptr orb,
            int abort_counter)
   : orb_(CORBA::ORB::_duplicate(orb))
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
index 452334f778a..fdde9dc70e6 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -10,8 +10,6 @@
 #include "tao/ORB_Core.h"
 #include "Server_Thread_Pool.h"
 
-ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$")
-
 Echo_Caller::Echo_Caller(Thread_Pool *pool)
   : pool_(pool)
 {
diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
index e916f9b08f4..b54d49e1e3d 100644
--- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -9,9 +9,6 @@
 #include "ORB_Task.h"
 #include "tao/Environment.h"
 
-ACE_RCSID (Bug_1361_Regression,
-           ORB_Task, "$Id$")
-
 ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 57ae006f44f..b984a401797 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "ace/Reactor.h"
 #include "ace/OS_NS_signal.h"
 
-ACE_RCSID(Bug_1270_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int serverthreads = 4;
 
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index ae617a640da..712dd4aa61b 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -7,8 +7,6 @@
 #include "Server_Thread_Pool.h"
 #include "ORB_Task.h"
 
-ACE_RCSID(Bug_1270_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index cdf5316cc59..975db7a363c 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$")
-
 #if defined (ACE_OPENVMS)
 // need this to circumvent link error on OpenVMS
 // has to do with interference in template instantiations
diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp
index 97d07727d6e..d86f9f1bc22 100644
--- a/TAO/tests/Bug_1476_Test/client.cpp
+++ b/TAO/tests/Bug_1476_Test/client.cpp
@@ -14,8 +14,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool level_obj = false;
 bool level_thread = false;
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index 822d5322d78..123a01f9dbb 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "tao/Stub.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Hello_ptr receiver,
                           CORBA::ORB_ptr o,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index c08ad59c653..563dbc2c577 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -4,12 +4,6 @@
 #include "Hello.h"
 #include "ace/ACE.h"
 
-
-ACE_RCSID (Bug_1482_Regression,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
     , mutex_ ()
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
index f3a3cfadc65..9447621cd73 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(Muxing, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index bfec4f1e8e9..b66be5463da 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 87d6842dbd1..661b1032310 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -3,10 +3,6 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (LongUpcall_Crash_Test,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index a2eda92853d..8713cbc32e0 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Hello_ptr receiver,
                           CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 7dc579f2fbc..55866f53bad 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 #include "Hello.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Hello, "$Id$")
-
 Hello::Hello(
     CORBA::ORB_ptr orb,
     bool simulate_crashes)
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index 88e34505a96..1654d4b483b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -4,8 +4,6 @@
 
 #include "Reply_Handler.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Reply_Handler, "$Id$")
-
 Reply_Handler::Reply_Handler (
     Test::Hello_ptr hello, CORBA::ORB_ptr orb)
   : counter_(1000)
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
index 9f6f0783b85..246a93ce865 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
@@ -3,8 +3,6 @@
 //
 #include "Server_Task.h"
 
-ACE_RCSID(Bug_1XXX_Regression, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index d604a62dd60..0bfccca2296 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int nthreads = 1;
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index bafab201b6b..1c0eb7b0c67 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (Bug_1XXX_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 bool simulate_crashes = true;
diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 7aa1287510a..c14f44467b4 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -10,8 +10,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1568_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index 24bbf4fc48f..b371b4bfdbc 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -13,8 +13,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1568_Regression, server, "$Id$")
-
 /**
  * @class Simple_C
  *
diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp
index d4e7029ae21..6e2108e82e9 100644
--- a/TAO/tests/Bug_1670_Regression/client.cpp
+++ b/TAO/tests/Bug_1670_Regression/client.cpp
@@ -10,8 +10,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_1670_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp
index 6062d01fc6f..a46f66bfd00 100644
--- a/TAO/tests/Bug_1670_Regression/server.cpp
+++ b/TAO/tests/Bug_1670_Regression/server.cpp
@@ -13,8 +13,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Bug_1670_Regression, server, "$Id$")
-
 /**
  * @class Simple_C
  *
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 6f909cab23f..8eaf4fdd0a6 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -8,10 +8,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID(Bug_2084_Regression,
-          Client_Task,
-          "$Id$")
-
 Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index 8490764d777..518367b85cd 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -7,8 +7,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(EventNode, EventNode, "$Id$")
-
 EventNode::EventNode (CORBA::ORB_ptr orb, ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , thr_id_ (thrid)
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index a374609b63a..c88af27ed68 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -7,8 +7,6 @@
 #include "tao/ORB_Table.h"
 #include "tao/ORB_Core_Auto_Ptr.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb,
               ACE_thread_t thrid)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index a34c5c366e6..ed7fc335f0f 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -8,11 +8,6 @@
 #include "ace/Manual_Event.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
 Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index ee93d6507bb..0f62f20b906 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 55dae0a50f3..fab5e5f50c3 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index a2c3e497ce9..20914396111 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index 1795e201f6a..0335cf3e142 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index cd5ad4edf9e..83ab1c74bd8 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
 const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior");
 
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 8d8913374e1..46efdd925ea 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index f6ff28cc076..6c9e99bf55e 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "brokenC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://broken.ior");
 
 int
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 28f7154e1d8..d2cd98aab98 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("broken.ior");
 
 int
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index f95f30bdc85..df2a18536d2 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index f75ce5ac238..4ed5e721048 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index c1d8bd1bb30..52e133d6c04 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp
index c0cc27d346e..f366ab803f9 100644
--- a/TAO/tests/Bug_2678_Regression/client.cpp
+++ b/TAO/tests/Bug_2678_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_2735_Regression/server.cpp b/TAO/tests/Bug_2735_Regression/server.cpp
index d2d35fa897a..4aa36e4d73c 100644
--- a/TAO/tests/Bug_2735_Regression/server.cpp
+++ b/TAO/tests/Bug_2735_Regression/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Bug_2735_Regression,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR* server_strat =
   ACE_STATIC_SERVICE_DIRECTIVE ("Server_Strategy_Factory",
                                 "-ORBConcurrency thread-per-connection");
diff --git a/TAO/tests/Bug_2792_Regression/client.cpp b/TAO/tests/Bug_2792_Regression/client.cpp
index 139fc1df7c9..087c31ecc6d 100644
--- a/TAO/tests/Bug_2792_Regression/client.cpp
+++ b/TAO/tests/Bug_2792_Regression/client.cpp
@@ -3,10 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/StringSeqC.h"
 
-ACE_RCSID(Bug_2792_Regression,
-          client,
-          "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
index c019047248b..1c6fc7253b7 100644
--- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp
@@ -17,8 +17,6 @@
 #include "ami_test_i.h"
 #include "tao/debug.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         CORBA::Long in_l,
                         const char * in_str,
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index fde5ffcc212..e5d72d5bb88 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -21,10 +21,6 @@
 #include "ace/OS_NS_Thread.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp
index eb2603dd591..46043d0d3ee 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2844_Regression/Hello.cpp
@@ -2,12 +2,6 @@
 
 #include "Hello.h"
 
-
-ACE_RCSID (Recursive,
-           Hello,
-           "$Id$")
-
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index f89dd4ed4a1..a3e741e3c9e 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -9,11 +9,6 @@
 #include <algorithm>
 #include <functional>
 
-
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp
index c1d8bd1bb30..52e133d6c04 100644
--- a/TAO/tests/Bug_2844_Regression/server.cpp
+++ b/TAO/tests/Bug_2844_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.cpp b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
index 70a7d6d3414..560ac417b3b 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(AMI_Buffering, Client_Task, "$Id$")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , terminate_loop_ (0)
diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp
index c61101acf34..1650e7cdb7b 100644
--- a/TAO/tests/Bug_3068_Regression/client.cpp
+++ b/TAO/tests/Bug_3068_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID (Bug_3068_Regression, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp
index 3708cb7eabe..c9aff062003 100644
--- a/TAO/tests/Bug_3068_Regression/server.cpp
+++ b/TAO/tests/Bug_3068_Regression/server.cpp
@@ -8,8 +8,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
-ACE_RCSID (Bug_3068_Regression, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int iterations = 10;
 
diff --git a/TAO/tests/Bug_3068_Regression/test_i.cpp b/TAO/tests/Bug_3068_Regression/test_i.cpp
index 0aed21b49f2..863770e0ec1 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3068_Regression/test_i.cpp
@@ -12,8 +12,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Bug_3068_Regression, test_i, "$Id$")
-
 void
 Callback_i::shutdown ()
 {
diff --git a/TAO/tests/Bug_3163_Regression/client.cpp b/TAO/tests/Bug_3163_Regression/client.cpp
index 1517d590490..7ac03d7b7c0 100644
--- a/TAO/tests/Bug_3163_Regression/client.cpp
+++ b/TAO/tests/Bug_3163_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int message_size = 0;
 
diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp
index ff5ed29321b..b9f417703c9 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3430_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_3430_Regression/client.cpp b/TAO/tests/Bug_3430_Regression/client.cpp
index 7536ee26f67..b42acef3bf4 100644
--- a/TAO/tests/Bug_3430_Regression/client.cpp
+++ b/TAO/tests/Bug_3430_Regression/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3430_Regression/server.cpp b/TAO/tests/Bug_3430_Regression/server.cpp
index cacd790a6ff..e6fe71dfc11 100644
--- a/TAO/tests/Bug_3430_Regression/server.cpp
+++ b/TAO/tests/Bug_3430_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp
index 1e272c82af2..88ef46a2a51 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3479_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_3479_Regression/client.cpp b/TAO/tests/Bug_3479_Regression/client.cpp
index 25bfbefe03a..33441b551c9 100644
--- a/TAO/tests/Bug_3479_Regression/client.cpp
+++ b/TAO/tests/Bug_3479_Regression/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/StringSeqC.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3479_Regression/server.cpp b/TAO/tests/Bug_3479_Regression/server.cpp
index cacd790a6ff..e6fe71dfc11 100644
--- a/TAO/tests/Bug_3479_Regression/server.cpp
+++ b/TAO/tests/Bug_3479_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3552_Regression/check.cpp b/TAO/tests/Bug_3552_Regression/check.cpp
index f1b4496375a..457f54f2b52 100644
--- a/TAO/tests/Bug_3552_Regression/check.cpp
+++ b/TAO/tests/Bug_3552_Regression/check.cpp
@@ -3,10 +3,6 @@
 #include "tao/CodecFactory/CodecFactory.h"
 #include "structC.h"
 
-ACE_RCSID (Recursive,
-           client,
-           "$Id$")
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
index 4d1cd6b3688..039c71fbbbf 100644
--- a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
+++ b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
@@ -6,13 +6,8 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID (Bug_3559_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR* log_file_;
 
-
 int
 parse_args (int argc, ACE_TCHAR* argv[])
 {
@@ -203,15 +198,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  
+
   result += check_logging ();
-  
+
   if (result == 0)
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Test passed!")));
   else
-    ACE_ERROR ((LM_ERROR, 
-                ACE_TEXT ("Test failed. Result: %d\n"), 
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Test failed. Result: %d\n"),
                 result));
   return result;
 }
diff --git a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
index 87e751f9887..377812a55bc 100644
--- a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
+++ b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
@@ -8,10 +8,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/ACE.h"
 
-ACE_RCSID (Bug_3559_Regression,
-           server,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
index 212a4a819b3..c2f5f3bf243 100644
--- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp
@@ -18,8 +18,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb,
                         CORBA::Long in_l,
                         const char * in_str,
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index 188a2de3914..b500352ea68 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -15,10 +15,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ami_test_i.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 10;
diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp
index 50e1fa3ac85..e4f57a1afb3 100644
--- a/TAO/tests/Bug_3567_Regression/server.cpp
+++ b/TAO/tests/Bug_3567_Regression/server.cpp
@@ -20,8 +20,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 int nthreads = 5;
 
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.cpp b/TAO/tests/Bug_3598a_Regression/Hello.cpp
index 7b9497529ec..4c72b17a7c6 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3598a_Regression/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index 1eb9ffec04b..8fe6aadfbbe 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
 
-ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp
index 95d61429e99..d124faebff9 100644
--- a/TAO/tests/Bug_3598a_Regression/server.cpp
+++ b/TAO/tests/Bug_3598a_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
index 156756b90a9..9b77796e863 100644
--- a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
+++ b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp
@@ -18,8 +18,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(AMI, ami_test_i, "$Id$")
-
 AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_3672_Regression/server.cpp b/TAO/tests/Bug_3672_Regression/server.cpp
index 456eceb946e..4b41a1bf7e5 100644
--- a/TAO/tests/Bug_3672_Regression/server.cpp
+++ b/TAO/tests/Bug_3672_Regression/server.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/Bug_3701_Regression/client.cpp b/TAO/tests/Bug_3701_Regression/client.cpp
index bcaafc79f4a..a3cea619961 100644
--- a/TAO/tests/Bug_3701_Regression/client.cpp
+++ b/TAO/tests/Bug_3701_Regression/client.cpp
@@ -2,8 +2,6 @@
 
 #include "tao/SystemException.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 int
 ACE_TMAIN(int, ACE_TCHAR *[])
 {
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp
index 684b38099e8..35280a77139 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp
@@ -3,10 +3,6 @@
 //
 #include "Test_i.h"
 
-ACE_RCSID(TestLargeSequence,
-          TestLargeSequence,
-          "$Id$")
-
 BoundSequences::BoundSequences (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Bug_3746_Regression/client.cpp b/TAO/tests/Bug_3746_Regression/client.cpp
index 9093c0fa7bb..0ed33cd8de7 100644
--- a/TAO/tests/Bug_3746_Regression/client.cpp
+++ b/TAO/tests/Bug_3746_Regression/client.cpp
@@ -3,10 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Bug_3746_Regression,
-          client,
-          "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Bug_3746_Regression/server.cpp b/TAO/tests/Bug_3746_Regression/server.cpp
index c6f2435e88e..e226e6405b7 100644
--- a/TAO/tests/Bug_3746_Regression/server.cpp
+++ b/TAO/tests/Bug_3746_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Bug_3746_Regression,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3790_Regression/server.cpp b/TAO/tests/Bug_3790_Regression/server.cpp
index 763e91666fa..7790d78d4ea 100644
--- a/TAO/tests/Bug_3790_Regression/server.cpp
+++ b/TAO/tests/Bug_3790_Regression/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Bug_3821_Regression/test.cpp b/TAO/tests/Bug_3821_Regression/test.cpp
index bd24defe508..fb63782b2cc 100644
--- a/TAO/tests/Bug_3821_Regression/test.cpp
+++ b/TAO/tests/Bug_3821_Regression/test.cpp
@@ -3,10 +3,6 @@
 #include "testC.h"
 #include "tao/CDR.h"
 
-ACE_RCSID(Test,
-          test,
-          "$Id$")
-
 namespace
 {
   template<typename T>
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 9a81adb0688..e46e22d1f7d 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -27,8 +27,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(CDR, allocator, "$Id$")
-
 #define DEFAULT_BUFFER_SIZE 512
 
 class Application_Simulator
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 6064e05ece0..2f78c30aa77 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -25,10 +25,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (CDR,
-           basic_types,
-           "$Id$")
-
 static int n = 4096;
 static int nloops = 100;
 
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index 5997edbe1c2..ebdde8cd3f7 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -26,8 +26,6 @@
 #include "tao/CDR.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(CDR, growth, "$Id$")
-
 static int
 test_write (TAO_OutputCDR &cdr, int n)
 {
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 5d54012c4af..d5e57b1cd78 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -25,14 +25,8 @@
 
 #include "ace/Log_Msg.h"
 
-
-ACE_RCSID (CDR,
-           tc,
-           "$Id$")
-
 // In this version of TAO typecodes are based on CDR, we have to
 // verify that CDR offers the services needed for Typecode...
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/CSD_Collocation/Collocation.cpp b/TAO/tests/CSD_Collocation/Collocation.cpp
index 22932237fef..1daaff56119 100644
--- a/TAO/tests/CSD_Collocation/Collocation.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation.cpp
@@ -7,8 +7,6 @@
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID(Collocation, main, "$Id$")
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index df5dc90d3d9..0f62f20b906 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index cbd78a6f0d6..937b8fc7e22 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 394c63527f5..210dd2f79b4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -5,10 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 535e7632c0d..b566ba935ed 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -6,8 +6,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 022cf6c0f47..1ca0695e1c4 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index ae19465711c..c8a51bd070a 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Hello, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index 1628e3d48d5..8bd8670713c 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Client_Leaks, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Process_Factory_ptr process_factory,
                           int iterations)
   : process_factory_ (Test::Process_Factory::_duplicate (process_factory))
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 8b6d7257784..6bf3cb78eac 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -4,8 +4,6 @@
 #include "Process.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Client_Leaks, Process, "$Id$")
-
 Process::Process (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index c58a665dec6..708265f5215 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -5,8 +5,6 @@
 #include "Startup_Callback.h"
 #include "ace/Process.h"
 
-ACE_RCSID(Client_Leaks, Process_Factory, "$Id$")
-
 Process_Factory::Process_Factory (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , shutdown_received_ (0)
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index 0dd3295e11f..d37db8a5690 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Client_Leaks, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 341c89ead6e..15eefd990eb 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -3,8 +3,6 @@
 //
 #include "Startup_Callback.h"
 
-ACE_RCSID(Client_Leaks, Startup_Callback, "$Id$")
-
 Startup_Callback::Startup_Callback (void)
 {
 }
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index 01379f1c35d..008cb91c960 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -3,8 +3,6 @@
 #include "Process.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, server, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index 01e917895f6..4380d7907cc 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 int iterations = 100;
 int threads = 12;
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index d2bd06b7e79..5ff92ceb7ad 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Client_Leaks, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 409984578b0..784f8b14f8b 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Server_Request_Interceptor.h"
 #include "tao/PI_Server/PI_Server.h"
@@ -6,12 +7,6 @@
 #include "tao/CDR.h"
 #include "testS.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           Server_Request_Interceptor,
-           "$Id$")
-
-//static const CORBA::ULong expected_version = 5;
-
 Server_Request_Interceptor::Server_Request_Interceptor (CORBA::ULong request_pass_count)
   : request_pass_count_ (request_pass_count)
   , request_count_ (0)
diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp
index 00b58854c2d..0fbf6222830 100644
--- a/TAO/tests/Collocated_Forwarding/server.cpp
+++ b/TAO/tests/Collocated_Forwarding/server.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ace/Get_Opt.h"
 #include "test_i.h"
@@ -11,10 +12,6 @@
 #include "tao/IORManipulation/IORManipulation.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Collocated_Forwarding,
-           server,
-           "$Id$")
-
 const CORBA::ULong passes_before_forward = 6;
 
 bool direct_collocation = false;
diff --git a/TAO/tests/Compression/bzip2server.cpp b/TAO/tests/Compression/bzip2server.cpp
index 79cf5feb27c..2fefc02091e 100644
--- a/TAO/tests/Compression/bzip2server.cpp
+++ b/TAO/tests/Compression/bzip2server.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
diff --git a/TAO/tests/Compression/lzoserver.cpp b/TAO/tests/Compression/lzoserver.cpp
index 735e14d7c30..767aa44933d 100644
--- a/TAO/tests/Compression/lzoserver.cpp
+++ b/TAO/tests/Compression/lzoserver.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/lzo/LzoCompressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
diff --git a/TAO/tests/Compression/zlibserver.cpp b/TAO/tests/Compression/zlibserver.cpp
index bdd9c164380..e6f69de9958 100644
--- a/TAO/tests/Compression/zlibserver.cpp
+++ b/TAO/tests/Compression/zlibserver.cpp
@@ -6,10 +6,6 @@
 #include "tao/Compression/Compression.h"
 #include "tao/Compression/zlib/ZlibCompressor_Factory.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
@@ -175,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (!test_compression (5, manager.in ()))
         retval = 1;
-      
+
 
       if (!test_invalid_compression_factory (manager.in ()))
         retval = 1;
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index 41012833ee6..0f33ce2fa4e 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -5,10 +5,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Connection_Failure,
-           client,
-           "$Id$")
-
 const char *ior =
   "corbaloc:iiop:192.3.47/10007/RandomObject";
 
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 81e0bae0828..ff2b431c101 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Connection_Timeout, client, "$Id$")
-
 const ACE_TCHAR *ior =
   ACE_TEXT("corbaloc:iiop:192.3.47/10007/RandomObject");
 
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 60de5a6d5d6..0f0a6f17474 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -3,8 +3,6 @@
 //
 #include "Service.h"
 
-ACE_RCSID(Crashed_Callback, Service, "$Id$")
-
 Service::Service (void)
   : orb_ (CORBA::ORB::_nil ()),
     test_count_ (0)
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 3530be3caba..d6ab103cc75 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -6,8 +6,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Crashed_Callback, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 107e83b1b12..aedc3c6a7e3 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -7,8 +7,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Crashed_Callback, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp
index 25eb782e1c9..4c33ad2c521 100644
--- a/TAO/tests/DIOP/UDP_i.cpp
+++ b/TAO/tests/DIOP/UDP_i.cpp
@@ -2,8 +2,6 @@
 
 #include "UDP_i.h"
 
-ACE_RCSID(UDP, UDP_i, "")
-
 // Constructor
 UDP_i::UDP_i (CORBA::ORB_ptr o) :
   orb_(CORBA::ORB::_duplicate (o))
diff --git a/TAO/tests/DIOP/client.cpp b/TAO/tests/DIOP/client.cpp
index dbb73d07644..776b2ef6248 100644
--- a/TAO/tests/DIOP/client.cpp
+++ b/TAO/tests/DIOP/client.cpp
@@ -30,8 +30,6 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 unsigned int msec = 500;
 unsigned int iterations = 1;
diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp
index 01fdf921945..3c8f6d626f6 100644
--- a/TAO/tests/DIOP/server.cpp
+++ b/TAO/tests/DIOP/server.cpp
@@ -27,8 +27,6 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(AMI, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index ed58e647d20..47f4419e939 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_Client_Module.h"
 #include "tao/TAO_Singleton_Manager.h"
@@ -7,11 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 
-ACE_RCSID (DLL_ORB,
-           Test_Client_Module,
-           "$Id$")
-
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index b972ede5455..6f6702697e3 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_Server_Module.h"
 #include "tao/TAO_Singleton_Manager.h"
@@ -6,11 +7,6 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Argv_Type_Converter.h"
-
-ACE_RCSID (DLL_ORB,
-           Test_Server_Module,
-           "$Id$")
-
 #include "ace/Get_Opt.h"
 
 
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index 9a3414ab41e..be88b80cb16 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -1,11 +1,8 @@
 // -*- C++ -*-
+// $Id$
 
 #include "Test_i.h"
 
-ACE_RCSID (DLL_ORB,
-           Test_i,
-           "$Id$")
-
 Test_i::Test_i (void)
   : orb_ ()
 {
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index fc0b34451e7..9ec2282ccda 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Counter_i.h"
 
-ACE_RCSID(tao, Counter_Servant, "$Id$")
-
 // Dtor-Ctor Implementation.
 
 Counter_Servant::Counter_Servant (Policy_Tester *policy_tester)
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 83d40afff39..f49887a77b8 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -18,8 +18,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao, Policy_Tester, "$Id$")
-
 Policy_Tester::Policy_Tester (void)
   : rt_object_properties_ (0),
     rt_poa_properties_ (0)
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 3215c2ef7b8..0fdb414c1c1 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,8 +1,7 @@
+// $Id$
 #include "Policy_Verifier.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tao, Policy_Verifier, "$Id$")
-
 Policy_Verifier::Policy_Verifier (void)
   : rt_object_properties_ (0)
   , rt_poa_properties_ (0)
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index e50ee9913a3..a6198a14efa 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -7,8 +7,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$")
-
 RT_Properties::RT_Properties (void)
   : priority_ (10)
 {
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 92ef57a48c3..dddf5c131c4 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -9,8 +9,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, client, "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 80dd35351b3..370dde2c27a 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -15,9 +15,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-ACE_RCSID(tao, server, "$Id$")
-
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d59598fa952..216cc50bc51 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -5,8 +5,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID(Failure, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 10;
 int do_shutdown = 0;
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 44c4ff825aa..17462fd4fc4 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -6,8 +6,6 @@
 #include "ping_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Faults, test_i, "$Id$")
-
 void
 PingObject_i::ping (PingObject_ptr callback)
 {
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 322c2cefc01..8ab0c5511ee 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Faults, server, "$Id$")
-
 int iterations = 60;
 int period = 10;
 int kill_on = 30;
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 106ae0b6573..23327d98042 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -19,8 +19,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp")
-
 // IDL File::System constructor
 FileImpl::System::System (PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index e5bc56086c0..efe5cecbcc9 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -23,9 +23,7 @@
 #include "ace/SString.h"
 #include "ace/Thread_Manager.h"
 
-ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp")
-
-  static const ACE_TCHAR *iorfile = ACE_TEXT("ior");
+static const ACE_TCHAR *iorfile = ACE_TEXT("ior");
 static const ACE_TCHAR *filename = ACE_TEXT("big.txt");
 
 static int NUM_THREADS = 4;
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index c02ab0419a1..f8436ec6402 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -8,10 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
-ACE_RCSID (File_IO,
-           server,
-           "$Id$")
-
 static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 static const int nthreads = 2;
 
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 75910c8096d..41a4cc13579 100755
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -7,8 +7,6 @@
 #include "ace/streams.h"
 #include "tao/Invocation_Utils.h"
 
-ACE_RCSID(ForwardOnceUponException, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
 int do_shutdown = 0;
@@ -83,7 +81,7 @@ public:
   // Return number of received exceptions.
   int num_received_ex () const;
 
-  // Is test done ? 
+  // Is test done ?
   void done ();
 
 private:
@@ -120,9 +118,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       int timeout = 30;
       int now = 0;
-      while (now < timeout 
-        && ((expect_ex_kind != TAO::FOE_NON 
-             && worker.received_ex_kind () != expect_ex_kind 
+      while (now < timeout
+        && ((expect_ex_kind != TAO::FOE_NON
+             && worker.received_ex_kind () != expect_ex_kind
              && worker.num_received_ex () != expect_num_ex)
             || expect_ex_kind == TAO::FOE_NON))
       {
@@ -152,16 +150,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       worker.thr_mgr ()->wait ();
 
-      if (worker.received_ex_kind () != expect_ex_kind 
+      if (worker.received_ex_kind () != expect_ex_kind
         || worker.num_received_ex () != expect_num_ex)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
           ("(%P|%t)client: test failed - expected is different from received. "
-          "expected %d/%d received %d/%d.\n"), 
+          "expected %d/%d received %d/%d.\n"),
           expect_ex_kind, expect_num_ex, worker.received_ex_kind (), worker.num_received_ex()),
                           1);
       }
-            
+
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)client: test passed.\n"));
     }
   catch (const CORBA::Exception& ex)
@@ -212,7 +210,7 @@ Worker::svc (void)
             ACE_DEBUG ((LM_DEBUG,
                         "(%P|%t) unexpected result = %d\n",
                         r));
-  
+
         }
         catch (const CORBA::OBJECT_NOT_EXIST &)
           {
@@ -257,25 +255,25 @@ Worker::svc (void)
       ex._tao_print_exception (
         "Unexpected exception caught");
     }
-   
+
   return 0;
 }
 
 
-int 
+int
 Worker::received_ex_kind () const
 {
   return received_ex_kind_;
 }
 
-int 
+int
 Worker::num_received_ex () const
 {
   return num_received_ex_;
 }
 
-void 
-Worker::done () 
+void
+Worker::done ()
 {
   done_ = true;
 }
diff --git a/TAO/tests/ForwardOnceUponException/server.cpp b/TAO/tests/ForwardOnceUponException/server.cpp
index 915615adbee..c80ecdd86f1 100755
--- a/TAO/tests/ForwardOnceUponException/server.cpp
+++ b/TAO/tests/ForwardOnceUponException/server.cpp
@@ -6,8 +6,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "tao/Invocation_Utils.h"
 
-ACE_RCSID(ForwardOnceUponException, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int expect_servant_calls = 1;
 int raise_exception = TAO::FOE_NON;
@@ -112,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)server: event loop finished\n"));
 
-      // If expect_servant_calls is 0, it means it's the request forward looping case so the 
+      // If expect_servant_calls is 0, it means it's the request forward looping case so the
       // servant continue receiving calls from a single request. We can not determine how many
       // servant calls but it should be more than the number of requests.
       if ((expect_servant_calls == 0 && (server_impl.ncalls () > num_requests))
diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp
index e899da4f4b4..e139a027d6c 100755
--- a/TAO/tests/ForwardOnceUponException/test_i.cpp
+++ b/TAO/tests/ForwardOnceUponException/test_i.cpp
@@ -6,7 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ForwardOnceUponException, test_i, "$Id$")
 extern int raise_exception;
 
 CORBA::Boolean
@@ -19,19 +18,19 @@ Simple_Server_i::test_is_a (const char * /* type */)
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise OBJECT_NOT_EXIST\n", ncalls_));
     throw ::CORBA::OBJECT_NOT_EXIST ();
   }
-  
+
   if ((raise_exception & TAO::FOE_COMM_FAILURE) == TAO::FOE_COMM_FAILURE)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise COMM_FAILURE\n", ncalls_));
     throw ::CORBA::COMM_FAILURE ();
   }
-  
+
   if ((raise_exception & TAO::FOE_TRANSIENT) == TAO::FOE_TRANSIENT)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise TRANSIENT\n", ncalls_));
     throw ::CORBA::TRANSIENT ();
   }
-  
+
   if ((raise_exception & TAO::FOE_INV_OBJREF) == TAO::FOE_INV_OBJREF)
   {
     //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise INV_OBJREF\n", ncalls_));
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index c92a7dcf9b6..a515a96d616 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Forwarding, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 10;
 int nthreads = 1;
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 3f969e20acc..eaa7b683af2 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Forwarding, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index 120c6f7b96b..4c2a71f0302 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Forwarding, test_i, "$Id$")
-
 CORBA::Boolean
 Simple_Server_i::test_is_a (const char * /* type */)
 {
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index b7af4d6d5b2..56c489c9f5a 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen,
                           int event_count,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index a8c008992f5..f406bca4fb0 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 static size_t nthreads = 1;
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index 81ee459c199..df4950cf28c 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Payload_Receiver.h"
 
-ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$")
-
 Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
  : count_ (0),
    orb_(CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 8be5ca51ce4..c5ccdf1ced7 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Big_Request_Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index 1da64d18952..df4950cf28c 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Payload_Receiver.h"
 
-ACE_RCSID(PMB_With_Fragments, Payload_Receiver, "$Id$")
-
 Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
  : count_ (0),
    orb_(CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index b3a64237d4a..b0a38d46b06 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Big_Request_Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index dd2e4af7a87..3e640a9f24c 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -4,9 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(ConnectionSpinning,
-          client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior");
 
 int
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 38eced40b06..c3dcc87f0f8 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -8,9 +8,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_resource.h"
 
-ACE_RCSID (ConnectionSpinning,
-           server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior");
 
 class Test_i: public virtual POA_Test
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index df5dc90d3d9..df49d37a507 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -1,10 +1,6 @@
-//
 // $Id$
-//
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 940e5439939..1bb3e718137 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -3,8 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index cacd790a6ff..e6fe71dfc11 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index 785ca17bae2..4242c5294a4 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -4,8 +4,6 @@
 #include "Hello.h"
 #include "HelloWorld.h"
 
-ACE_RCSID(ICMG_Any_Bug, Hello, "$Id")
-
 Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   : poa_ (PortableServer::POA::_duplicate (poa)),
     orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index a3811dfb3d9..9fe083d79ed 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -4,10 +4,6 @@
 
 #include "HelloWorld.h"
 
-
-ACE_RCSID (ICMG_Any_Bug, HelloWorld, "$Id$")
-
-
 HelloWorld::HelloWorld (void)
 {
 }
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 8638de85caa..ad0f749914a 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -6,10 +6,6 @@
 #include "ace/Get_Opt.h"
 #include <string>
 
-ACE_RCSID (ICMG_Any_Bug,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index f0e69cd322c..73297f5f58c 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ICMG_Any_Bug,
-           server,
-           "$Id$ ")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index abfc992c475..9bd530cdd3f 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -11,17 +11,11 @@
  */
 //=========================================================================
 
-
 #include "ace/Log_Msg.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 
-
-ACE_RCSID (IORManipluation,
-           IORTest,
-           "$Id$")
-
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp
index 7ba5cbed371..49fb18bdf7e 100644
--- a/TAO/tests/IORManipulation/filter/server.cpp
+++ b/TAO/tests/IORManipulation/filter/server.cpp
@@ -4,10 +4,6 @@
 #include "tao/IORManipulation/IORManip_IIOP_Filter.h"
 #include "tao/Stub.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 class Filter_Localhost: public TAO_IORManip_IIOP_Filter
 {
 public:
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index fc4222d3e30..b4039bb8ddc 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -2,8 +2,6 @@
 
 #include "bogus_i.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames, bogus_i, "$Id$")
-
 bogus::bogus()
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index 8d13e5ff5f2..fe00631cb7d 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -10,10 +10,6 @@
 
 #include "bogus_i.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames,
-           generate_ior,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 int
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index 10935773c5c..141f437f63e 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -12,10 +12,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (IOR_Endpoint_Hostnames,
-           list_interfaces,
-           "$Id$")
-
 #if defined (ACE_HAS_IPV6) && !defined (ACE_USES_IPV4_IPV6_MIGRATION)
 ACE_INET_Addr default_address (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6);
 #else
diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp
index 1980e729449..f3da93063ac 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.cpp
+++ b/TAO/tests/LongDouble/LongDoubleTest.cpp
@@ -4,8 +4,6 @@
 #include "LongDoubleTest.h"
 #include "Global.h"
 
-ACE_RCSID (LongDoubleTest, LongDoubleTest, "$Id$")
-
 LongDoubleTest::LongDoubleTest (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
index c29a84d6511..fcfa27fbd5b 100644
--- a/TAO/tests/LongDouble/client.cpp
+++ b/TAO/tests/LongDouble/client.cpp
@@ -5,9 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
 
-
-ACE_RCSID (LongDoubleTest, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 
 int
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
index fd1680bd140..422113bd072 100644
--- a/TAO/tests/LongDouble/server.cpp
+++ b/TAO/tests/LongDouble/server.cpp
@@ -4,10 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (LongDoubleTest,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index 4185fda90f6..f897a8e4e92 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -23,9 +23,6 @@
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-
-ACE_RCSID(Forwarding, Servant_Locator, "$Id$")
-
 Servant_Locator::Servant_Locator (CORBA::ORB_ptr orb_ptr)
 
   : orb_var_ (CORBA::ORB::_duplicate (orb_ptr))
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 2864a422a4b..9de74183c81 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior_input_file = 0;
 
 int
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 3b88b668292..c08f005687a 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 4fb6535c3ab..65291139aa8 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 Simple_Server_i::Simple_Server_i (void)
   :orb_ (0)
 {
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index f3661e9aa95..24d1baf9ead 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "Client_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp")
-
 Client_Task::Client_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index cf6b1a2c027..72b6bf4f7aa 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -3,10 +3,6 @@
 //
 #include "Receiver_i.h"
 
-ACE_RCSID(MT_BiDir,
-          Receiver_i,
-          "$Id$")
-
 Receiver_i::Receiver_i (void)
   :  message_count_ (0)
   ,  byte_count_ (0)
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 131b21cd59d..00b43a9ed7d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -1,12 +1,6 @@
 #include "Sender_i.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID(MT_BiDir,
-          Sender_i,
-          "$Id$")
-
-
 Sender_i::Sender_i (CORBA::ULong no_clients,
                     ACE_Manual_Event &event)
   : event_ (event)
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index fa16e325137..d095f295801 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -9,12 +9,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID (MT_BiDir,
-           Server_Task,
-           "Server_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp")
-
-
 Server_Task::Server_Task (Sender_i *sender,
                           ACE_Manual_Event &event,
                           int no_iterations,
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 62b9bd177d6..0dbda12772b 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -7,8 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "Client_Task.h"
 
-ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index f359a0cbb79..0b68e2a9ddd 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -10,12 +10,6 @@
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Manual_Event.h"
 
-
-ACE_RCSID (MT_BirDir,
-           server,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_output_file = 0;
 static int no_iterations = 10;
 static int no_clients = 2;
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index e9326f57905..68a42caab41 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 1aaae1ef783..ba259d61fb6 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Client, orb_creation, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 7250c546583..0fdbfb1e6c2 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index ed136fa4fa4..3d7090b6bb2 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
 void
 Simple_Server_i::test_method (void)
 {
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index bbd7c0fbf61..894cd6d506b 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Task.h"
 #include "testC.h"
 
-ACE_RCSID(MT_Server, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 5;
 int do_shutdown = 0;
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index ffb6c640744..d17af2e4e06 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(MT_Server, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int nthreads = 4;
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index 80aa987cc4a..c42d5905cc6 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -8,8 +8,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(MT_Server, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 4e75b286b50..55a5b85d921 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -3,8 +3,6 @@
 #include "Collocation_Tester.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (tests, Collocation_Tester, "$Id$")
-
 const char *Quote::top = "Ciao";
 const char *Quote::left = "Hola";
 const char *Quote::right = "Hello";
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 06ba1e71ca6..46f6fbd0c1e 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -3,8 +3,6 @@
 #include "Multiple_Impl.h"
 #include "Collocation_Tester.h"
 
-ACE_RCSID (tests, Multiple_Impl, "$Id$")
-
 ///////////////////////////////////////////////////////////
 //     Bottom_Impl Implementation
 //
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 1b1d7a9d8f5..5fe2937927a 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -3,8 +3,6 @@
 # include "Collocation_Tester.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (tests, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 
 int
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index b36c578233c..2684fb90c2f 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (tests, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 2002768040c..0ba1e8728fa 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Client_Task.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Receiver_ptr receiver,
                           CORBA::Long event_count,
                           CORBA::ULong event_size,
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index 1ad5ab31565..b8953970bdb 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -3,8 +3,6 @@
 //
 #include "Receiver.h"
 
-ACE_RCSID(Muxing, Receiver, "$Id$")
-
 Receiver::Receiver (CORBA::ORB_ptr orb)
   :  message_count_ (0)
   ,  byte_count_ (0)
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index 34e6f5e9edb..e51cb2f7168 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -4,8 +4,6 @@
 
 #include "Server_Task.h"
 
-ACE_RCSID(Muxing, Server_Task, "$Id$")
-
 Server_Task::Server_Task (CORBA::ORB_ptr orb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index b839fca5b4c..42e326bbdbd 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -3,8 +3,6 @@
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 bool shutdown_srv = false;
 
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index 185470abca0..3ee44d8089e 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Muxing, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index f5f1f82d65e..ca00b1f2043 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -3,8 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "testC.h"
 
-ACE_RCSID(Native_Exceptions, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int niterations = 100;
 
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 7a79dd13fb2..6e82ee485f9 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Native_Exceptions, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index 62e6003f6ea..43643b16f0d 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -6,8 +6,6 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Native_Exceptions, test_i, "$Id$")
-
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x)
 {
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index c017c639d69..3d33a2a5a1b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -21,8 +21,6 @@
 
 #include "tao/Exception.h"
 
-ACE_RCSID(MT_Client_Test, MT_Object_i, "$Id$")
-
 #define MAX_HOP_COUNT 20
 
 // CTOR
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 2935b601b93..5318bcb69c6 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -27,8 +27,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Malloc_Base.h"
 
-ACE_RCSID(MT_Client_Test, client, "$Id$")
-
 MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
                                 int client_number)
   : argc_ (argc),
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index dd2d64f0aad..73b716d5219 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -24,8 +24,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "tao/Utils/ORB_Manager.h"
 
-ACE_RCSID(MT_Client_Test, local_server, "$Id$")
-
 MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
                                 int argc,
                                 ACE_TCHAR **argv,
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index cc902da6345..b01e3dbdb8e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -24,8 +24,6 @@
 #include "ace/Event_Handler.h"
 #include "ace/Sig_Handler.h"
 
-ACE_RCSID(MT_Client_Test, server, "$Id$")
-
 class TestShutdown : public ACE_Event_Handler
 {
 public:
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 39912c97638..555e40df214 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 2fceb937b1f..8121c3a19b5 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, server, "$Id$")
-
 static int quiet = 0;
 // The test is quiet...
 
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 53fd7dc44a9..7a979bec324 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Simple, client, "$Id$")
-
 static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index c2ecfcc8498..9d278338a50 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -20,8 +20,6 @@
 #include "tao/Exception.h"
 #include "Initiator_i.h"
 
-ACE_RCSID(Triangle_Test, Initiator_i, "$Id$")
-
 // CTOR
 Initiator_i::Initiator_i (Object_A_ptr object_A_ptr,
                                 Object_B_ptr object_B_ptr)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 66764ee0b3c..8a5a2e8bc88 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -21,8 +21,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
-ACE_RCSID(Triangle_Test, Object_A_i, "$Id$")
-
 // CTOR
 Object_A_i::Object_A_i (void)
   : finish_two_way_call_ (0)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 3428fd18159..4506293e4eb 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -21,8 +21,6 @@
 #include "Object_B_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Triangle_Test, Object_B_i, "$Id$")
-
 // CTOR
 Object_B_i::Object_B_i (void)
 {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 3433e5fea2a..92500938f11 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -23,8 +23,6 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Triangle_Test, initiator, "$Id$")
-
 Initiator_Server::Initiator_Server (void)
   : object_A_key_ (0),
     object_B_key_ (0),
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index dd47d9447c5..564ae4e6818 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -21,8 +21,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Triangle_Test, server_A, "$Id$")
-
 Object_A_Server::Object_A_Server (void)
   : ior_output_file_ (0)
 {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index bee7d17754c..59fb2d7be9b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -21,8 +21,6 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Triangle_Test, server_B, "$Id$")
-
 Object_B_Server::Object_B_Server (void)
   : ior_output_file_ (0)
 {
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index f77379f0d4a..26ca7cc92cc 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -21,8 +21,6 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$")
-
 int
 test_with_regular_poa_manager (int argc,
                                ACE_TCHAR **argv,
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 3d8106210bc..aaa376144d8 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -3,11 +3,6 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (ORT,
-           ORT_test_IORInterceptor,
-           "$Id$")
-
-
 ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
   : establish_count_ (0),
     components_establish_count_ (0)
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 3477dd25651..7580b83f35a 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -1,10 +1,6 @@
-#include "ORT_test_i.h"
-
-
-ACE_RCSID (ORT,
-           ORT_test_i,
-           "$Id$")
+// $Id$
 
+#include "ORT_test_i.h"
 
 ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 0373edccd29..cee5cdf81fa 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -1,11 +1,6 @@
-#include "ObjectReferenceFactory.h"
-
-
-ACE_RCSID (ORT,
-           ObjectReferenceFactory,
-           "$Id$")
-
+// $Id$
 
+#include "ObjectReferenceFactory.h"
 #include "tao/debug.h"
 
 
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index 054801c2c7e..9840a5ded32 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -5,12 +5,6 @@
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/PortableServer.h"
 
-
-ACE_RCSID (ORT,
-           ServerORBInitializer,
-           "$Id$")
-
-
 void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */)
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index f7465651657..7d71a124a69 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -1,15 +1,11 @@
 // -*- C++ -*-
+// $Id$
 
 #include "ServerRequestInterceptor.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (ORT,
-           ServerRequestInterceptor,
-           "$Id$")
-
-
 ServerRequestInterceptor::ServerRequestInterceptor (
   const char * orb_id,
   PortableServer::Current_ptr poa_current)
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index 9d0945ebd74..9d3d446fe01 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -4,10 +4,6 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (ORT,
-           client,
-           "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index a340cfb774a..d7335d39e83 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ORT_test_i.h"
 #include "ServerORBInitializer.h"
 
@@ -6,11 +8,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (ORT,
-           server,
-           "$Id$")
-
-
 const ACE_TCHAR *ior_output_file = 0;
 
 int
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index de9fba45745..ebbe574b6a7 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -3,8 +3,6 @@
 #include "Loader.h"
 #include "Test_i.h"
 
-ACE_RCSID(Object_Loader, Loader, "$Id$")
-
 Loader::Loader (void)
 {
 }
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index f0f147c9f96..6ca3c420183 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "Test_i.h"
 
-ACE_RCSID(Object_Loader, Test_i, "$Id$")
-
 CORBA::Long
 Test_i::instance_count_ = 0;
 
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 698098675db..d36b6d9f84d 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -3,8 +3,6 @@
 //
 #include "Oneway_Buffering.h"
 
-ACE_RCSID(Oneway_Buffering, Oneway_Buffering, "$Id$")
-
 Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
                                     Test::Oneway_Buffering_Admin_ptr admin)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 432642eac38..b788fa1b5a5 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -9,8 +9,6 @@ namespace
   const unsigned int timeout_in_sec= 2u;
 }
 
-ACE_RCSID(Oneway_Buffering, Oneway_Buffering_Admin, "$Id$")
-
 Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , request_count_ (0)
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 73b72c533a0..5d7a1e4eb1a 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Oneway_Buffering, admin, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior");
 
 int
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 8a3362dc2ea..2295206cc06 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -9,8 +9,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Oneway_Buffering, client, "$Id$")
-
 const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior");
 const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior");
 int iterations = 20;
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 7b8934d39b7..864a5b70845 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Oneway_Buffering, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior");
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 738d0e312ed..5600b0a9eb1 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -5,8 +5,6 @@
 #include "Client_Task.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
 Client_Task::Client_Task (Test::Sender_ptr reply_gen,
                           Test::Receiver_ptr us,
                           ACE_Thread_Manager *thr_mgr,
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 5e408c90e49..6944edebff0 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -1,6 +1,6 @@
-#include "Sender_i.h"
+// $Id$
 
-ACE_RCSID(Oneways_Invoking_Twoways, Sender_i, "$Id$")
+#include "Sender_i.h"
 
 Sender_i::Sender_i (CORBA::ORB_ptr orb,
                     CORBA::ULong no)
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 09b14bef701..e2113237161 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -4,8 +4,6 @@
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 9f91969b420..a6b8a2db6e6 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "tao/QtResource/QtResource_Loader.h"
 
-ACE_RCSID(QtTests, client, "$Id$")
-
 #include "client.h"
 
 int
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 7c7817eb715..c7c1d385ed1 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (QtTests, server, "$Id$")
-
 // who defines index macro?
 #ifdef index
 #undef index
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 7ce6cc05e7d..745b65dc513 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -2,10 +2,6 @@
 
 #include "test_i.h"
 
-ACE_RCSID( QtTests,
-           test_i,
-           "$Id$")
-
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index 3a557a0c78e..e9cfc0daf8b 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -17,10 +17,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdlib.h"
 
-ACE_RCSID (tests,
-           Queued_Message_Test,
-           "$Id$")
-
 /// Max number of bytes on each message block
 const size_t max_block_length = 256;
 
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index a2e99ade4fc..4aab39a74d8 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -4,8 +4,6 @@
 #include "Oneway_Receiver.h"
 #include "Shutdown_Helper.h"
 
-ACE_RCSID(Reliable_Oneways, Oneway_Receiver, "$Id$")
-
 Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index d7168f8a5a5..c001ac11463 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -3,8 +3,6 @@
 //
 #include "Shutdown_Helper.h"
 
-ACE_RCSID(Reliable_Oneways, Shutdown_Helper, "$Id$")
-
 Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 52a6c6d8531..06564a478f7 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -6,8 +6,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Reliable_Oneways, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int test_sync_with_target    = 0;
 int test_sync_with_server    = 0;
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index c6a9dbc93d3..0bdbcaf5f0d 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Reliable_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 
 int
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index c756e56970d..a7da7ced2c7 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -1,12 +1,9 @@
 // $Id$
 
-
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
-
 // Name of file contains ior.
 static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index bc3c4eb6698..0d8c00c9c54 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 const ACE_TCHAR *client_done_file = ACE_TEXT("client_done.ior");
 
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 0c8b541d1da..5ff43da0a20 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -3,8 +3,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID(Single_Read, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb, const ACE_TCHAR *file_name)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     client_done_ (false),
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 6bc6276367b..d97c21c98b9 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -25,8 +25,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
-
 // Eager buffering option.
 static int eager_buffering = 0;
 
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 2a50e5d639d..9efcb0bc822 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -4,8 +4,6 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
 
 int
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index d27303d7a99..62fce048a11 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -5,8 +5,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Time_Value.h"
 
-ACE_RCSID(Timed_Buffered_Oneways, test_i, "$Id$")
-
 test_i::test_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index ffe3470c864..ca3287f6e3d 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -9,8 +9,6 @@
 #include "ace/Synch.h"
 #include "ace/Auto_Event.h"
 
-ACE_RCSID(Test, First_i, "$Id$")
-
 First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     two_way_done_(two_way_done)
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index 426ab1c5052..b7775ca7721 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -7,9 +7,6 @@
 #include "Object_Factory_i.h"
 #include "ace/Synch.h"
 
-ACE_RCSID(Test, Test, "$Id$")
-
-
 Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     length_(len)
@@ -31,8 +28,8 @@ Object_Factory_i::create_first (void)
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
 
-  PortableServer::POA_var root_poa =    
-    PortableServer::POA::_narrow (poa_object.in ()); 
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::ObjectId_var id =
     root_poa->activate_object (first_impl);
@@ -61,8 +58,8 @@ Object_Factory_i::create_second (void)
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
 
-  PortableServer::POA_var root_poa =    
-    PortableServer::POA::_narrow (poa_object.in ()); 
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::ObjectId_var id =
     root_poa->activate_object (second_impl);
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index 462864406a7..a4cc32c1562 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -7,12 +7,6 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "ace/Auto_Event.h"
 
-
-ACE_RCSID (Two_Objects,
-           Second_i,
-           "$Id$")
-
-
 Second_i::Second_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len, ACE_Auto_Event &two_way_done)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index df4b10ff103..4251fbe5aea 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -3,8 +3,6 @@
 #include "Two_ObjectsC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Test, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 
 int
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 18a19d7071f..8ea19195262 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-ACE_RCSID(Test, server, "$Id$")
-
 int msglen = 100; //default length of reply message is 100 bytes
 int nthreads = 2;
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index 03cd26b8eaf..d44ed0577d4 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(StringArray, client, "$Id$")
-
 const ACE_TCHAR *ior = ACE_TEXT("file://server.ior");
 
 int
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index d24d49cba4d..1430c74eabc 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -4,8 +4,6 @@
 #include "ace/OS_NS_stdio.h"
 #include "testImpl.h"
 
-ACE_RCSID(MT_Client, server, "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
 
 int
diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp
index ab73744cbe1..e22724f5b73 100644
--- a/TAO/tests/ZIOP/Hello.cpp
+++ b/TAO/tests/ZIOP/Hello.cpp
@@ -3,8 +3,6 @@
 //
 #include "Hello.h"
 
-ACE_RCSID(Hello, Hello, "$Id$")
-
 Hello::Hello (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
@@ -36,17 +34,17 @@ Hello::get_big_reply ()
   return reply_mesg._retn ();
 }
 
-void 
+void
 Hello::big_request (const ::Test::Octet_Seq & octet_in)
 {
   if (octet_in.length () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("Server side BLOB received\n")));
     }
   else
     {
-      ACE_DEBUG ((LM_ERROR, 
+      ACE_DEBUG ((LM_ERROR,
                   ACE_TEXT("Error recieving BLOB on server\n")));
     }
 }
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
index ef1bba0bc57..8c711ba1536 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
@@ -1,9 +1,6 @@
-#include "TestCompressor.h"
-
-ACE_RCSID (TEST,
-           TestCompressor,
-           "$Id$")
+// $Id$
 
+#include "TestCompressor.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
index 276edc0c121..a61e71d60f3 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
@@ -1,10 +1,8 @@
+// $Id$
+
 #include "TestCompressor_Factory.h"
 #include "TestCompressor.h"
 
-ACE_RCSID (TEST,
-           TestCompressor_Factory,
-           "$Id$")
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp
index 15e2b51cc37..9621ac3857e 100644
--- a/TAO/tests/ZIOP/client.cpp
+++ b/TAO/tests/ZIOP/client.cpp
@@ -8,8 +8,6 @@
 #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
 #include "TestCompressor//TestCompressor_Factory.h"
 
-ACE_RCSID(Hello, client, "$Id$")
-
 #define DEFAULT_COMPRESSION_LEVEL 6
 ::Compression::CompressionManager_var compression_manager = 0;
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp
index 5fdd724b921..2db9e88eb8a 100644
--- a/TAO/tests/ZIOP/server.cpp
+++ b/TAO/tests/ZIOP/server.cpp
@@ -11,10 +11,6 @@
 #include "tao/Policy_CurrentC.h"
 #include "tao/Transport.h"
 
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
 const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior");
 int test = 1;
author	Johnny Willemsen <jwillemsen@remedy.nl>	2010-09-08 13:44:26 +0000
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2010-09-08 13:44:26 +0000
commit	fe7fd971374ebd99ca4007927e07656c89afbd2c (patch)
tree	caee2c60d8d7773b8103f50fd26ce990718abac2 /TAO
parent	6da6a5a3ddf69472767335eb14a6dd72003d2544 (diff)
download	ATCD-fe7fd971374ebd99ca4007927e07656c89afbd2c.tar.gz