summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/Any/Indirected/IndirectedTest.mpc3
-rw-r--r--TAO/tests/Any/Recursive/RecursiveHello.mpc3
-rw-r--r--TAO/tests/Big_Oneways/Session.h3
-rw-r--r--TAO/tests/Big_Twoways/Session.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.cpp3
-rw-r--r--TAO/tests/Bug_1495_Regression/test_i.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_2188_Regression/broken_i.cpp3
-rw-r--r--TAO/tests/Bug_2188_Regression/broken_i.h3
-rw-r--r--TAO/tests/Bug_2241_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc3
-rw-r--r--TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc3
-rw-r--r--TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc3
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp3
-rw-r--r--TAO/tests/Bug_3766_Regression/TestI.cpp3
-rw-r--r--TAO/tests/Bug_3766_Regression/TestI.h3
-rw-r--r--TAO/tests/Bug_3853_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc3
-rw-r--r--TAO/tests/COIOP/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_NoColl/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Server_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Server_Task.h3
-rw-r--r--TAO/tests/Collocation_Tests/Server_Task.h3
-rw-r--r--TAO/tests/DII_AMI_Forward/server_interceptor.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h3
-rw-r--r--TAO/tests/DynAny_Test/da_tests.idl3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp3
-rw-r--r--TAO/tests/MT_BiDir/Sender_i.h3
-rw-r--r--TAO/tests/MT_BiDir/Server_Task.h3
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Server_Task.h3
-rw-r--r--TAO/tests/ORB_init/Portspan/simpleI.cpp3
-rw-r--r--TAO/tests/ORB_init/Portspan/simpleI.h3
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h3
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h3
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/interceptors.h3
-rw-r--r--TAO/tests/Two_Objects/First_i.h3
-rw-r--r--TAO/tests/Two_Objects/Object_Factory_i.h3
-rw-r--r--TAO/tests/Two_Objects/Second_i.h3
-rw-r--r--TAO/tests/Two_Objects/worker.h3
78 files changed, 0 insertions, 234 deletions
diff --git a/TAO/tests/Any/Indirected/IndirectedTest.mpc b/TAO/tests/Any/Indirected/IndirectedTest.mpc
index 483f231c9d4..aa9ed68b228 100644
--- a/TAO/tests/Any/Indirected/IndirectedTest.mpc
+++ b/TAO/tests/Any/Indirected/IndirectedTest.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 1a24787bc1e..974f137cc48 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
NonRecursive.idl
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index d7ead0a9a8c..e085eaf5c3c 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BIG_ONEWAYS_SESSION_H
#define BIG_ONEWAYS_SESSION_H
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 5c0934db301..1ba68b85b77 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef BIG_TWOWAYS_SESSION_H
#define BIG_TWOWAYS_SESSION_H
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 23a798743b6..2c4921837d5 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index bb9804ef668..3073b9069b0 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index 88578e5d335..ad7ed5cb1e1 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* @file test_i.cpp
* @author Will Otte <wotte@dre.vanderbilt.edu>
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index 346ec702c70..ce694224731 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp
index 55ed7628215..0045d9c8970 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.cpp
+++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h
index ac3add2cdc8..4df02de9d58 100644
--- a/TAO/tests/Bug_2188_Regression/broken_i.h
+++ b/TAO/tests/Bug_2188_Regression/broken_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.h b/TAO/tests/Bug_2241_Regression/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc b/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
+++ b/TAO/tests/Bug_2804_Regression/Bug_2804_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc b/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
+++ b/TAO/tests/Bug_2844_Regression/Bug_2844_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc b/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
index 5b74e6da1ce..a28f67e16e9 100644
--- a/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
+++ b/TAO/tests/Bug_2918_Regression/Bug_2918_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ClientORBInitializer.h"
void
diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp
index 8a6e189eee3..181c2886086 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.cpp
+++ b/TAO/tests/Bug_3766_Regression/TestI.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h
index b5f77e17d02..b731c02c884 100644
--- a/TAO/tests/Bug_3766_Regression/TestI.h
+++ b/TAO/tests/Bug_3766_Regression/TestI.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h
index 0530de3d658..2042b5f9872 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc b/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
index 25f0f8e8f5f..5d8dc4424b6 100644
--- a/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
+++ b/TAO/tests/Bug_3919_Regression/Bug_3919_Regression.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
idlflags += -Sp
idlflags -= -ae
diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/COIOP/Server_Task.h
+++ b/TAO/tests/COIOP/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.h b/TAO/tests/Collocated_DerivedIF/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.h b/TAO/tests/Collocated_NoColl/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.h
+++ b/TAO/tests/Collocated_NoColl/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.h b/TAO/tests/DII_AMI_Forward/server_interceptor.h
index 8300f690343..a5496d72271 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.h
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
index 866eca8d10d..6e6d7085452 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
index 1b8ff8da26a..690c31bb2a7 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/DynAny_Test/da_tests.idl b/TAO/tests/DynAny_Test/da_tests.idl
index 233fc00ea76..41f04581386 100644
--- a/TAO/tests/DynAny_Test/da_tests.idl
+++ b/TAO/tests/DynAny_Test/da_tests.idl
@@ -1,7 +1,4 @@
/* -*- C++ -*- */
-//
-// $Id$
-
#include <orb.idl>
module DynAnyTests
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc b/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
index 3d2f45850f7..99fe40c4e1d 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
+++ b/TAO/tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc
@@ -1,8 +1,5 @@
// What I'd really like to have is a separate project
// that is a library for the CORBA Object.
-//
-// $Id$
-
project(list_interfaces) : taoexe {
Source_Files {
list_interfaces.cpp
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index 7bdbfc10987..2b3c830f3ec 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -1,9 +1,6 @@
//
// This initializes an ORB, a POA, an Object within that POA, and
// obtains and prints an IOR for that Object.
-//
-// $Id$
-
#include "tao/corba.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 79032e33f6f..a57494d613d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h
index 42686741b21..3a34b55d44c 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/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/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
index f2e8d54f467..ce6324fb1e6 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.cpp
+++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
index 82f58709d84..f1585e382e5 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.h
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
// Center for Distributed Object Computing
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
index e42043c0711..cea47faeb95 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index efe8ef39a88..de95918d721 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index b2f106599f9..0f2492ffa39 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index d0ea171f9ce..571addecc3e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 33cd057ed2a..940b75fd189 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
index 2f4406185c9..45d43b27eca 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "ClientORBInitializer.h"
void
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 4816c106c71..33ed2b76898 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index d904a3f507a..40f5e613113 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
index 80338bf5bde..fecb2b05fdd 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Collocated_ORBInitializer.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index 6499213ab03..bfe8918012a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index a22ea274557..23dfac6b088 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 1b271359c52..4fc60a541bc 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_INTERCEPTORS_H
#define TAO_INTERCEPTORS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 3a06286218c..84cdaa3c472 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index f522246aefb..d2c2e6de155 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_SERVER_ORB_INITIALIZER_H
#define TAO_ECHO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 36835290eb9..41f75c15a45 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index 754bea0000f..97ae5106f72 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
index c625755ff58..c41c39e0bca 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-
project(*Server): taoserver, iorinterceptor, interceptors {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
index 0eb892fe7f8..a360e498266 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Collocated_ORBInitializer.h"
#include "interceptors.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 67930a90275..9fc120bc16b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index cbc56e7ae60..8306c7f8a9a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index 20fce3fbff1..1c55d41bbfc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_INTERCEPTORS_H
#define TAO_INTERCEPTORS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
index 6aca7e80aac..15e101d9b8f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Client_ORBInitializer.h"
#include "client_interceptor.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index c3527047ad8..51fdd6e6f9f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
index dc9f9092a96..35392d319e8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#include "Echo_Server_ORBInitializer.h"
#include "server_interceptor.h"
#include "tao/PI/ORBInitInfo.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index 7fa088d2b74..1918eb4f31f 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_ECHO_SERVER_ORB_INITIALIZER_H
#define TAO_ECHO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
index d8191b98755..cc5cd7a8eb6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TEST_SERVER_TASK_H
#define TEST_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index 6d17ec03c4b..6c0cd3318c6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 44dab0149bb..753c8cef055 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index 25510e64609..e7b490fa096 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_CLIENT_INTERCEPTOR_H
#define TAO_CLIENT_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 12d511c2291..2755fd363b3 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_SERVER_INTERCEPTOR_H
#define TAO_SERVER_INTERCEPTOR_H
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
index e3f2a2850cc..e3592668b11 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef INTERCEPTORS_H
#define INTERCEPTORS_H
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index e3f2a2850cc..e3592668b11 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef INTERCEPTORS_H
#define INTERCEPTORS_H
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 2c66560aa93..0d15b14b8d1 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_FIRST_I_H
#define TAO_TWO_OBJECTS_FIRST_I_H
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 5735a295a6b..5d7c6f53d26 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef OBJECT_FACTORY_I_H
#define OBJECT_FACTORY_I_H
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 6bc2d4b3179..c4f54572700 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_SECOND_I_H
#define TAO_TWO_OBJECTS_SECOND_I_H
diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h
index 5448f00e253..1df842862e9 100644
--- a/TAO/tests/Two_Objects/worker.h
+++ b/TAO/tests/Two_Objects/worker.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-
#ifndef TAO_TWO_OBJECTS_WORKER_H
#define TAO_TWO_OBJECTS_WORKER_H