summaryrefslogtreecommitdiff
path: root/TAO/tests/CSD_Strategy_Tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/CSD_Strategy_Tests')
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp1
97 files changed, 0 insertions, 107 deletions
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index f1bfd44f74a..b9ae2cb7e37 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index f319293d3ed..fa005fdda5c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 4ca2dc82800..ea45b56328d 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 50d125e8193..3141df7fde7 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index f1979e1a13d..084647b1edd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppHelper.h"
void
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 1799f1032f3..27aaab8a148 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APPHELPER_H
#define APPHELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
index cfb13da0cd9..676e4ae79f2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index 097249686ee..a8307ab45b4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APP_SHUTDOWN_H
#define APP_SHUTDOWN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
index 9ebd7dc8f34..d2cadef5379 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Test
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
index 8f9afcf68de..379a8ce41d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CANCELAPPXCEPTION_IDL
#define CANCELAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
index 361bb3cd465..221781e1b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
index dbc71737f99..5f8ac3afd29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientTask.h"
#include "ClientEngine.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
index 794900c41ce..e5ad609a19e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CUSTOMEXCEPTION_IDL
#define CUSTOMEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
index 4f76953e24c..330914baa72 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOEXCEPTION_IDL
#define FOOEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 812495cc732..4284e163ee8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "OrbRunner.h"
#include "OrbTask.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
index 8e3f8138239..36fff3dd607 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ORB_RUNNER_H
#define ORB_RUNNER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 738af1ea9df..48663b6fc01 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServantList_T.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
index 43e639c9beb..20607775fd3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVANTLIST_T_H
#define SERVANTLIST_T_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 8e39e223b45..46fabc593e8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "StatisticsHelper.h"
// swap function for integers
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index 16ed9c88eef..ae95c226bf7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_HELPER_H
#define STATISTICS_HELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
index faa872c6e87..eb6905eb2e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestAppBase.h"
TestAppBase::TestAppBase(const char* name)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
index 3d52871e907..0fb4aaaaa9f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPBASE_H
#define TESTAPPBASE_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
index 2ac53939b77..f4cf0a8d88c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPXCEPTION_IDL
#define TESTAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
index bcbdb6e9e6b..a5e08322381 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPMAIN_H
#define TESTAPPMAIN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
index 9b855c486d8..ca907778452 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_A
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
index e9f3b0345f8..86c7b7e96d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_IDL
#define FOO_A_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index 94e0a9d13d8..6b776551fd7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_ClientEngine.h"
#include "Foo_A_Statistics.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
index 82cb6b65221..c98bd78c21b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_Statistics.h"
#include "Foo_A_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
index b9301b915bf..f2b979cea57 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_A_H
#define STATISTICS_A_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index a7ca8835ecc..c6b4504db22 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_i.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 16a53f60ddf..8f5bde6d947 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_I_H
#define FOO_A_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
index c6e2f4cd967..dd19470fae6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_B
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 31b0d120dae..2a43feb4f6d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
Callback_i::Callback_i()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index cb9b851c68e..04b2d94c5d2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
index 949f08397ad..e5ee97f163e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_IDL
#define FOO_B_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index 9d497df00c9..6592f5b0720 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_ClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index 0c41b14b0bc..b6d215e0a94 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_SimpleClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index 2db50ba7eb8..79cdd00ed9b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_Statistics.h"
#include "Foo_B_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
index e8d9569a2d5..6dadbe4d564 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_B_H
#define STATISTICS_B_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 5e90582eff3..151dda93167 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_B_i.h"
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 1a0367a27e7..6ad53b221ff 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_I_H
#define FOO_B_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
index ef1996b0a26..8e8044b90e7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_C
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
index b7eeea96f33..6315c0beae8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_IDL
#define FOO_C_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index b84640b56e0..3b66b5e29c9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_ClientEngine.h"
#include "AppHelper.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index 260bf44b3e9..8d717ec510d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_ClientEngine.h"
#include "CustomExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index acd49fa4665..b33c12bfa71 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_Proxy.h"
#include "Foo_C_cust_op1.h"
#include "Foo_C_cust_op2.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
index b6155743e3b..6f314f493a4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Statistics.h"
#include "Foo_C_ClientEngine.h"
#include "Foo_C_Custom_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
index f115ddc2b1f..79de17967ee 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_C_H
#define STATISTICS_C_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 36734cadf2b..7d20b104616 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op1.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index 40ffbf190f9..7a6933c5dfd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op2.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 7e009e52230..33d68371a87 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op3.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
index f4acb9c02d8..34164cc5149 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op4.h"
#include "Foo_C_i.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 9a165fe984c..134cf755d07 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op5.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index d9e11bfad32..144f2027738 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_i.h"
#include "AppShutdown.h"
#include "CustomExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index 6262bce85dd..cd858e9c49f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_I_H
#define FOO_C_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
index 50a4510a73b..f7d3362010c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index 3524f4f98cc..b94c0b06e9c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index b5910996e11..b0056a179c3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 21b94144ddd..abde30b72f6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index 3ed51561d1d..1afc33c0b6e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index 1cd428ddf23..a9331abcc0a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 1e1dc4811d0..32f98b91403 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
index 0be257accae..f756a6920fc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index a9b8b14ed5e..96b4f181f3e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 02d78238a8c..e4b0a709066 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 87d51f92e3b..9d43cef70aa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 0246da44cf8..1be5ea37097 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
index ca9f92ac607..99ba4b4b33f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_c {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index d2b3b5b90a8..6c37f9ed293 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index a9dad6ccc1b..f89df26d866 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 93b84ad02dd..25383409b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index a61522a1372..8628996fce9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
index 116a9142daa..9472aca3ec4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index abaed430dc8..144fb6910b1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 5d2ca8262dc..f403566be8e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
index afd9e5d8e68..f9d7d6f9d66 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index b2facabbb25..55a40bae54e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 3e235a78124..00076b5953a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index db7bd534377..4c2cf169f29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"