Zapped two line id tags

48 files changed, 0 insertions, 139 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index c6d4c104dcc..03d34cf3108 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer.h"
 #include "ServerRequest_Interceptor.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index 7aff46ebb9d..b23cba1c322 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer2.h"
 #include "ServerRequest_Interceptor2.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index df3b9bad0f6..5becd14b268 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer2.h"
 #include "ServerRequest_Interceptor2.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index 28c65bdca2b..df9db17965f 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer2.h"
 #include "ServerRequest_Interceptor2.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
index 6d33ff19052..bcbbebb7f2d 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer2.h"
 #include "ServerRequest_Interceptor2.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 78df0a897f3..9c9670f5b46 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ServerORBInitializer.h"
 #include "ServerRequest_Interceptor.h"
 #include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ClientORBInitializer.h"
 
 void
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
index 4d7be111da0..f4bdbbf8f0c 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef COLLOCATED_SERVER_TASK_H
 #define COLLOCATED_SERVER_TASK_H
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 1a547dd5d5a..546c0361c90 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "ReplicationManagerFaultConsumerAdapter.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index f4975b0497b..68a21e1c5ef 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -1,6 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
 #ifndef REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H
 #define REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H
 #include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 70ccfbf26f6..249072b8085 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "StubBatchConsumer.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index e38d27d010e..aedc1a399cb 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -1,6 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
 #ifndef STUBBATCHCONSUMER_H
 #define STUBBATCHCONSUMER_H
 #include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 2b8903ed3d3..5541c294eaa 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "StubFaultAnalyzer.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 4f2ea3cf2d9..424ca9315b1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -1,6 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
 #ifndef STUBFAULTANALYZER_H
 #define STUBFAULTANALYZER_H
 #include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 2aa86ed70b9..079559f73ee 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "StubFaultConsumer.h"
 #include "ace/Get_Opt.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 67f4f0dea81..9845df441d0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -1,6 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
 #ifndef STUBFAULTCONSUMER_H
 #define STUBFAULTCONSUMER_H
 #include /**/ <ace/pre.h>
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index e51a9eacf59..6beb80cdb60 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "StubFaultNotifier.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 8822194e8f5..c1ded566c7f 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -1,6 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
 #ifndef STUBFAULTNOTIFIER_H_
 #define STUBFAULTNOTIFIER_H_
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
index 1664eddc322..bbb473fe9c7 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef BASIC_H
 #define BASIC_H
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
index 21d10f6644c..687fa64cca8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
 #include "orbsvcs/FT_NamingManager.idl"
 
 /// Put the interfaces in a module, to avoid global namespace pollution
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
index 37aec36f681..81884559d55 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef BASIC_H
 #define BASIC_H
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
index 21d10f6644c..687fa64cca8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-
 #include "orbsvcs/FT_NamingManager.idl"
 
 /// Put the interfaces in a module, to avoid global namespace pollution
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
index da9a196f72f..1b39951d65d 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc
@@ -1,7 +1,4 @@
 // -*- MPC -*-
-//
-// $Id$
-
 project(*idl): taoidldefaults, ami {
   IDL_Files {
     ami_test.idl
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index f153c453cde..bfd0b44531a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -1,7 +1,4 @@
 // -*- MPC -*-
-//
-// $Id$
-
 project(*idl): taoidldefaults {
   IDL_Files {
     test.idl
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
index b09077d66c7..3775912ef8f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
@@ -1,7 +1,4 @@
 // -*- MPC -*-
-//
-// $Id$
-
 project(*idl): taoidldefaults {
   idlflags += -Sa -St
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 84aeb82e37e..278511cb33f 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef SERVER_I_H
 #define SERVER_I_H
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
index 934b92a2264..8c2a9bdc62a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef TAO_SERVER_INTERCEPTOR_H
 #define TAO_SERVER_INTERCEPTOR_H
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
index 3c6d45a1b75..9b28828dbdb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Bug_2962_Regression.mpc
@@ -1,7 +1,4 @@
 // -*- MPC -*-
-//
-// $Id$
-
 project(*): taoclient, ifr_client {
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
index 0faeabc2c03..d32c97df594 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler v1.5a_p8 ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
index e3e10eea60e..84cfb593ad6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 
 #ifndef TESTIMPL_H_
 #define TESTIMPL_H_
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index d9a02338230..105a8bcc551 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef BASIC_H
 #define BASIC_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl
index 0c9a380b07c..51074c0ebe0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/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/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
index c9af47702c2..0d239e82e8f 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef BASIC_H
 #define BASIC_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl
index 25065f3c3e1..924263a4704 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/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/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
index cedab2b655b..d0191e7f336 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef FACTORY_H
 #define FACTORY_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
index 87df1062797..a8baa790ca6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef FACTORY_MAP_H
 #define FACTORY_MAP_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
index 39b02503054..0e79be4b7c6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl
index 99a9521e595..7534755bd97 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/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/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 7ad15cded9f..075283b4610 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef FACTORY_H
 #define FACTORY_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
index 87df1062797..a8baa790ca6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef FACTORY_MAP_H
 #define FACTORY_MAP_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 12eccd1512d..129c11dc3c1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl
index 4c0f00b66a1..2e0303544b4 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/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/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index b53ae03f1a7..361c5a9e9c3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef BASIC_H
 #define BASIC_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index c21ff402b60..42a1e609843 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl
index 25e2829b394..763f8f6a78e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Test.idl
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/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/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
index 79032e33f6f..a57494d613d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef MT_BIDIR_RECEIVER_H
 #define MT_BIDIR_RECEIVER_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
index 42686741b21..3a34b55d44c 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #ifndef MT_BIDIR_SERVER_TASK_H
 #define MT_BIDIR_SERVER_TASK_H
 
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
index 1d7af9b5648..7fc392022de 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp
@@ -1,7 +1,4 @@
 // -*- C++ -*-
-//
-// $Id$
-
 #include "Foo_i.h"