Removed a lot of old Id tags

107 files changed, 0 insertions, 321 deletions

diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
index 5e23f3d9732..53c7dd0be35 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Stock.h"
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.h b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
index 1c9522acd68..b348be6e4c2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef STOCK_H
 #define STOCK_H
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index 8953bb542ac..adfb7e71d9a 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "StockFactory.h"
 #include "ace/streams.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 4edf6fb9952..17f030929c9 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef STOCKFACTORY_H
 #define STOCKFACTORY_H
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Test.idl b/TAO/orbsvcs/examples/LoadBalancing/Test.idl
index ea0cb943d44..0d2553df8c2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Test.idl
+++ b/TAO/orbsvcs/examples/LoadBalancing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 module Test
 {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index ba31135980a..e14aeb636d7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -1,7 +1,4 @@
 // ============================================================================
-//
-// $Id$
-//
 // ============================================================================
 
 #include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
index a93a0002f14..374ebb64e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
 
 // ============================================================================
-//
-// $Id$
-//
 // ============================================================================
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
index ede4dc7780d..c662025627e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
@@ -1,7 +1,4 @@
 // ============================================================================
-//
-// $Id$
-//
 // ============================================================================
 
 
diff --git a/TAO/orbsvcs/orbsvcs/TimeBase.idl b/TAO/orbsvcs/orbsvcs/TimeBase.idl
index 40a51d7de8a..a40043d6c04 100644
--- a/TAO/orbsvcs/orbsvcs/TimeBase.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeBase.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef _TIME_BASE_IDL_
 #define _TIME_BASE_IDL_
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
index f20041016a0..02c41a39012 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// A simple module to avoid namespace pollution
 module Test
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
index f20041016a0..02c41a39012 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// A simple module to avoid namespace pollution
 module Test
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index 92dce8ce091..aa2c400f3af 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef ROUNDTRIP_H
 #define ROUNDTRIP_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
index 7e72f72bcb5..7ecc7ddc699 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// A simple module to avoid namespace pollution
 module Test
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index dc425ae9747..fc611073c89 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef SESSION_H
 #define SESSION_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index e91a2a57568..13665b0a280 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef SESSION_FACTORY_H
 #define SESSION_FACTORY_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
index 2b27d49688c..57a7a5c2958 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// A simple module to avoid namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 82bc24276b5..d9abffac695 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "tao/corba.h"
 
 // Attempts to resolve the NameService.
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index be4e2d44eac..d9b3a0120e1 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 8414a6d3d2c..949168c1d71 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index ce818b72c04..aa5305f1866 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
index 1b66c41a709..aad83d030b5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index 1c7d9ff5608..df4990b3c12 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 6202345bde1..93461daa94d 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
index 9e1fa22e0be..61b56f2d3f7 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
index 23e2e601a64..2e0f3e265ce 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Hello_Impl.h"
 
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
index f6900ca2e9b..303dcbb637a 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "HelloS.h"
 #include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index f6e0c0122e1..b201c95b513 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Task.h"
 #include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index dfa637f9960..33537d3fd5c 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ServerRequest_Interceptor2.h"
 #include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index ca2bdccf0e6..5f48cef8b47 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
index dc6d9c82e4e..1611703e9b3 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
index 00a7f2ce48b..1a6c841d700 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef SHUTDOWN_H
 #define SHUTDOWN_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
index 9c94701468d..bd9e2c54acc 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Hello_Impl.h"
 
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
index 092f55994b2..94cbd88d1c4 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "HelloS.h"
 
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
index bd6e67c94b9..8b7c976dce5 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Task.h"
 #include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 56129a8e434..7c6ac21a3b1 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/GOA.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index 185704c073d..81d7d7081fe 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
index 00d76318ae6..4650216060a 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
index 9e1fa22e0be..61b56f2d3f7 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index c5463121e4f..d8c46266d98 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
index e605dee88f8..b068dbb391b 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
index 958e025a4cb..6e38a0ef68f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 04ad5ba319a..15d7b298abc 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
index af231fe1540..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
index 00a7f2ce48b..1a6c841d700 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef SHUTDOWN_H
 #define SHUTDOWN_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
index 052df98670f..a096bc37133 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 module Test
 {
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
index caf66622920..e5adde74096 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
index 509f618d3b8..189f408731f 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
index 9b3e442dbde..c5cab70f9d5 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "test_impl.h"
 
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
index 4ad50da4557..25aad8e5c45 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef _TEST_IMPL_H_
 #define _TEST_IMPL_H_
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index ff30844d186..d299fbe0924 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Client_Task.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
index 38be7e2df24..0f02aee45e9 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef COLLOCATED_TEST_CLIENT_TASK_H
 #define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index 3048e6f95f7..4c63fd5a6f1 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Table.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl b/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
index 871ff05f9df..dc17be6fc03 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 module ECM_IDLData
 {
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
index f44811dcd02..62e0128ade6 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 ACE_INLINE int
 ECM_Federation::sender_local_addr (ACE_INET_Addr& addr)
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl b/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
index 47ede657b9a..e085e2458e0 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface Callback
 {
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index 085f99d3e35..5af5a0e8c4f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Hello.h"
 
 
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index a6c492ee005..2d7cfb2e5e0 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef HELLO_H
 #define HELLO_H
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl b/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
index d6002892314..5d51be7d886 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
index bb278211006..0c870efaab4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface bug_689_regression
 {
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
index e1325a2aa8b..b1693cd7f78 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-//
 
 #include "Server_ORBInitializer.h"
 #include "server_interceptor.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
index c1d0a17a924..ea652c725d0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-//
 
 #ifndef TAO_SERVER_ORB_INITIALIZER_H
 #define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
index 6e5d83ab0fc..e89e0b500d0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 module Test {
   typedef long ErrorType;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
index b1c414b33e7..d8c4133b4b0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "GoodDay.h"
 
 GoodDay::GoodDay (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index cb35c06c610..0425c501516 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef GOODDAY_H
 #define GOODDAY_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
index 2ede1277b90..63d350aa399 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 module Test
 {
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
index c6f0b7e7654..b984ea371d5 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Hello_Impl.h"
 
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
index 890ec58bd8e..ffa68678b76 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef _HELLOS_IMPL_H_
 #define _HELLOS_IMPL_H_
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
index 28d5e5fe81b..4a97333f149 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Task.h"
 #include "ace/Atomic_Op_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
index 045adfe7820..49cfc29a1ef 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 13c6cad7ed9..fa003a0b18e 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "McastHello.h"
 
 McastHello::McastHello (CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef MCASTHELLO_H
 #define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Test.idl b/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
index d23e4fd3773..400c79e3753 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "McastHello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef MCASTHELLO_H
 #define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl b/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
index f195a6e5c9a..7dd3173ccc4 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "McastHello.h"
 
 
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef MCASTHELLO_H
 #define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl b/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl b/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
index 4839f8a67b1..46833825dea 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface Callback
 {
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 8e1ad8e0a71..43dd91c23b8 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Client_Task.h"
 #include "MessengerC.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
index e3a91380355..7faa37e6a74 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef COLLOCATED_TEST_CLIENT_TASK_H
 #define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.idl b/TAO/orbsvcs/tests/Security/Callback/client.idl
index 9ac07bd3cd5..ae2d92d47ae 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.idl
+++ b/TAO/orbsvcs/tests/Security/Callback/client.idl
@@ -1,8 +1,5 @@
 //
 // Client interface definition.
-//
-// $Id$
-//
 
 
 interface client
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.idl b/TAO/orbsvcs/tests/Security/Callback/server.idl
index 66e11c7fa4b..af1e82dd699 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.idl
+++ b/TAO/orbsvcs/tests/Security/Callback/server.idl
@@ -1,8 +1,5 @@
 //
 // Server interface definition.
-//
-// $Id$
-//
 
 #include "client.idl"
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 24d1baf9ead..27649c77a50 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Client_Task.h"
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
index 778e9618258..f0e94c59e2a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef MT_BIDIR_CLIENT_TASK_H
 #define MT_BIDIR_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
index b8e7383670e..693e0d5765a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface Receiver
 {
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
index 72b6bf4f7aa..900e505506a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Receiver_i.h"
 
 Receiver_i::Receiver_i (void)
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
index 398955cca27..8f426fb3106 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef MT_BIDIR_RECEIVER_I_H
 #define MT_BIDIR_RECEIVER_I_H
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
index 9aa036f3327..b3927c57c9b 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 #include "Receiver.idl"
 
 interface Sender
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
index d095f295801..c2919011234 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "Server_Task.h"
 #include "Sender_i.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
index 107fea38768..b953ff22e91 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface Simple_Server
 {
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
index 3191d2be3e5..d457ba444ad 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 interface Simple_Server
 {
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
index 0b7c505dec5..2f05d6995eb 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-//
 
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 4d588fdfd60..3934b8461a8 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #include "status_i.h"
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 853351b58cd..1f709d09964 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 
 #ifndef STATUS_I_H
 #define STATUS_I_H