Remove doxygen style Id tag with two space before $Id#

63 files changed, 0 insertions, 126 deletions

diff --git a/TAO/tests/POA/Adapter_Activator/server.cpp b/TAO/tests/POA/Adapter_Activator/server.cpp
index 075079129c5..d4a2556bd54 100644
--- a/TAO/tests/POA/Adapter_Activator/server.cpp
+++ b/TAO/tests/POA/Adapter_Activator/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  This example is very similar to the Explicit_Activation example
  *  except that the POAs are deleted once the object references have
  *  been created. After this, an adapter activator is install in the
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index 087db823045..31a23182892 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     server.cpp
  *
- *  $Id$
- *
  *   This program tests that multiple calls to the Servant Locator
  *   can take place simultaneously.
  *
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index 914f665c636..24b802ed6a5 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Current.cpp
  *
- *  $Id$
- *
  *   This program tests if accessing the POA current before the
  *   RootPOA can cause any problems.
  *
diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp
index 8cadb1d1896..bcbd934120b 100644
--- a/TAO/tests/POA/DSI/client.cpp
+++ b/TAO/tests/POA/DSI/client.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     client.cpp
  *
- *  $Id$
- *
  *    A client program for the Database IDL module
  *
  *
diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp
index 4d74ddfce0a..0895c895833 100644
--- a/TAO/tests/POA/DSI/server.cpp
+++ b/TAO/tests/POA/DSI/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file      server.cpp
  *
- *  $Id$
- *
  *    A server program for the File IDL module
  *
  *
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index 0a2ada0131d..20f2f6061f3 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Default_Servant.cpp
  *
- *  $Id$
- *
  *   This program tests the behavior of POA::id_to_servant() and
  *   POA::reference_to_servant() with the use of default servants.
  *
diff --git a/TAO/tests/POA/Default_Servant2/File.idl b/TAO/tests/POA/Default_Servant2/File.idl
index e1e156e06ab..f94bf938d2b 100644
--- a/TAO/tests/POA/Default_Servant2/File.idl
+++ b/TAO/tests/POA/Default_Servant2/File.idl
@@ -3,8 +3,6 @@
 /**
  *  @file     File.idl
  *
- *  $Id$
- *
  *   A simple File Descriptor and File System IDL interface.
  *
  *
diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp
index 3542cdfc3cf..19b8848b452 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.cpp
+++ b/TAO/tests/POA/Default_Servant2/File_i.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     File_i.cpp
  *
- *  $Id$
- *
  *    Implementation of the File IDL module and the interfaces
  *    Descriptor and System in it.
  *
diff --git a/TAO/tests/POA/Default_Servant2/File_i.h b/TAO/tests/POA/Default_Servant2/File_i.h
index 96238ca075e..fec52426c4b 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.h
+++ b/TAO/tests/POA/Default_Servant2/File_i.h
@@ -3,8 +3,6 @@
 /**
  *  @file     File_i.h
  *
- *  $Id$
- *
  *    Defines the implementation classes for the File IDL
  *   module
  *
diff --git a/TAO/tests/POA/Default_Servant2/client.cpp b/TAO/tests/POA/Default_Servant2/client.cpp
index 70cfde5879e..86a9e820d32 100644
--- a/TAO/tests/POA/Default_Servant2/client.cpp
+++ b/TAO/tests/POA/Default_Servant2/client.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     client.cpp
  *
- *  $Id$
- *
  *    A client program for the File IDL module
  *
  *
diff --git a/TAO/tests/POA/Default_Servant2/server.cpp b/TAO/tests/POA/Default_Servant2/server.cpp
index c4bf0788b75..486e63bdbcc 100644
--- a/TAO/tests/POA/Default_Servant2/server.cpp
+++ b/TAO/tests/POA/Default_Servant2/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file      server.cpp
  *
- *  $Id$
- *
  *    A server program for the File IDL module
  *
  *
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index c5b086aa895..447b436dbaf 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Etherealization.cpp
  *
- *  $Id$
- *
  *   This program tests for deactivation and etherealization of
  *   reference counted and non reference counted servants.
  *
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 9f7f101b28b..11023cd6fcc 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Excessive_Object_Deactivations.cpp
  *
- *  $Id$
- *
  *   This program tests for excessive deactivations of a servant.
  *   The test checks excessive deactivations in a POA with SYSTEM_ID
  *   and other POA with USER_ID.  The test also check for excessive
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
index b82f4b1bdef..5ebd204e06d 100644
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ b/TAO/tests/POA/Explicit_Activation/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  Explicit creation of servants.
  *
  *
diff --git a/TAO/tests/POA/FindPOA/FindPOA.cpp b/TAO/tests/POA/FindPOA/FindPOA.cpp
index 6fdc6432df0..e23ef6a45f1 100644
--- a/TAO/tests/POA/FindPOA/FindPOA.cpp
+++ b/TAO/tests/POA/FindPOA/FindPOA.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     FindPOA.cpp
  *
- *  $Id$
- *
  *   This Program tests the find_POA method of a POA.
  *
  *
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.h b/TAO/tests/POA/Forwarding/Servant_Activator.h
index e2e81975774..c5265b339ac 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.h
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Activator.h
  *
- *  $Id$
- *
  *   Defines a ServantActivator class, used with a POA having a
  *   RETAIN policy
  *
diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp
index 11f800e37f8..fa90877dbb5 100644
--- a/TAO/tests/POA/Forwarding/client.cpp
+++ b/TAO/tests/POA/Forwarding/client.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     client.cpp
  *
- *  $Id$
- *
  *
  *   This is a simple test client implementation.  Also looks out
  *   for forwarding exceptions
diff --git a/TAO/tests/POA/Forwarding/server.cpp b/TAO/tests/POA/Forwarding/server.cpp
index 09a0867f073..72cfedbfeb9 100644
--- a/TAO/tests/POA/Forwarding/server.cpp
+++ b/TAO/tests/POA/Forwarding/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  Server that receives requests.  The server can be asked to
  *  forward new requests to another server.
  *
diff --git a/TAO/tests/POA/Forwarding/test_i.h b/TAO/tests/POA/Forwarding/test_i.h
index ce1fbff6f14..7bc71934c57 100644
--- a/TAO/tests/POA/Forwarding/test_i.h
+++ b/TAO/tests/POA/Forwarding/test_i.h
@@ -2,8 +2,6 @@
 /**
  *  @file     test_i.h
  *
- *  $Id$
- *
  *   Defines test_i class for the test interface
  *
  *
diff --git a/TAO/tests/POA/Generic_Servant/test_i.h b/TAO/tests/POA/Generic_Servant/test_i.h
index cc3c834acb5..af212ab43f3 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.h
+++ b/TAO/tests/POA/Generic_Servant/test_i.h
@@ -2,8 +2,6 @@
 /**
  *  @file     test_i.h
  *
- *  $Id$
- *
  *   Defines test_i class for the test interface
  *
  *
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 5d544812401..a1c77b1d081 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    Identity.cpp
  *
- *  $Id$
- *
  *  This program demonstrates and tests how to move between id,
  *  reference, and servants.
  *
diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp
index 9f274cb60a4..d7eb32742e5 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Activator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Activator.cpp
  *
- *  $Id$
- *
  *   Implementation of <ServantActivator>, which is used by a POA
  *   with a RETAIN policy.
  *
diff --git a/TAO/tests/POA/Loader/Servant_Activator.h b/TAO/tests/POA/Loader/Servant_Activator.h
index 7f1815ac5ed..6ce4840c4d7 100644
--- a/TAO/tests/POA/Loader/Servant_Activator.h
+++ b/TAO/tests/POA/Loader/Servant_Activator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Activator.h
  *
- *  $Id$
- *
  *   Defines a <ServantActivator> class, which activates a servant by
  *   obtaining it and associates it with an object on-demand.
  *
diff --git a/TAO/tests/POA/Loader/Servant_Locator.cpp b/TAO/tests/POA/Loader/Servant_Locator.cpp
index 7faaa0a429d..22de62cf1ed 100644
--- a/TAO/tests/POA/Loader/Servant_Locator.cpp
+++ b/TAO/tests/POA/Loader/Servant_Locator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Locator.cpp
  *
- *  $Id$
- *
  *   Implementation of ServantLocator class, used with a POA
  *   having a NON_RETAIN policy.
  *
diff --git a/TAO/tests/POA/Loader/Servant_Locator.h b/TAO/tests/POA/Loader/Servant_Locator.h
index 050856983b3..42a9b5d6394 100644
--- a/TAO/tests/POA/Loader/Servant_Locator.h
+++ b/TAO/tests/POA/Loader/Servant_Locator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Locator.h
  *
- *  $Id$
- *
  *   Defines a ServantLocator class , used with a POA having
  *   a NON_RETAIN policy.
  *
diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h
index 15db7a8549a..5abc20301c1 100644
--- a/TAO/tests/POA/Loader/Server_Manager.h
+++ b/TAO/tests/POA/Loader/Server_Manager.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Server_Manager.h
  *
- *  $Id$
- *
  *   Helper class for the server application.
  *
  *
diff --git a/TAO/tests/POA/Loader/server.cpp b/TAO/tests/POA/Loader/server.cpp
index 37603d1319b..276a65ffa72 100644
--- a/TAO/tests/POA/Loader/server.cpp
+++ b/TAO/tests/POA/Loader/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     server.cpp
  *
- *  $Id$
- *
  *   Server application to test the Servant Activator and Servant Locator.
  *
  *
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 98350ccd826..811f8e5ffcc 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     MT_Servant_Locator.cpp
  *
- *  $Id$
- *
  *   This program tests that multiple calls to the Servant Locator
  *   can take place simultaneously.
  *
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 77a0ad2a2c0..12ba936e94f 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Nested_Non_Servant_Upcalls.cpp
  *
- *  $Id$
- *
  *   This program tests that nested non-servant upcalls are handled
  *   correctly.
  *
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index 3d503c35d19..c99dbb669df 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    NewPOA.cpp
  *
- *  $Id$
- *
  *  This program demonstrates creation of new POAs, as children of the root POA or the
  *  existing POA.
  *  There are three new POA created in this example.
diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.cpp b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
index 6a5c163120a..301e8aaef1d 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/test.cpp
+++ b/TAO/tests/POA/Non_Retain_System_Id/test.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     test.cpp
  *
- *  $Id$
- *
  *   This program verifies that a POA using the NON_RETAIN policy creates
  *   unique system IDs, also that objects created with a USER id policy is
  *   not given a bo
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 3d862fd28db..e9611df0d90 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Non_Servant_Upcalls.cpp
  *
- *  $Id$
- *
  *   This program tests the users ability to make calls on a POA
  *   during non-servant upcalls.  In this example, a servant which
  *   is being destroyed during because of a deactivate_object()
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index f497a31d384..27d4d954195 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Object_Reactivation.cpp
  *
- *  $Id$
- *
  *   This program tests the reactivation of a servant that has been
  *   deactivated but not removed from the Active Object Map yet.
  *
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.cpp
index 646f86ba81b..29c25e83119 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Activator.cpp
  *
- *  $Id$
- *
  *   Implementation of ServantActivator, which is used by a POA with
  *   a RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.h
index db87624ce55..4c227614caa 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Servant_Activator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Activator.h
  *
- *  $Id$
- *
  *   Defines a ServantActivator class.
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
index b4937835efb..fea0650a0b2 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h
@@ -2,8 +2,6 @@
 /**
  *  @file     test_i.h
  *
- *  $Id$
- *
  *   Defines test_i class for the test interface
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp
index 3f0aa24d8e2..636a4e4ba29 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Activator.cpp
  *
- *  $Id$
- *
  *   Implementation of ServantActivator, which is used by a POA with
  *   a RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
index 5f455082704..7f9b9d26c99 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Activator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Activator.h
  *
- *  $Id$
- *
  *   Defines a ServantActivator class.
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
index ed317299e10..faec7e47208 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Locator.cpp
  *
- *  $Id$
- *
  *   Implementation of ServantLocator class , used with a POA
  *   having a NON_RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
index 13c3e5857ab..22350d5b781 100644
--- a/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/tests/POA/On_Demand_Activation/Servant_Locator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Locator.h
  *
- *  $Id$
- *
  *   Defines a ServantLocator class, used with a POA having a
  *   NON_RETAIN policy
  *
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index ed72b90c473..344b2b3833b 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     server.cpp
  *
- *  $Id$
- *
  *   Server to test the Servant Activator and Servant Locator for a POA.
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp
index 8b79859a529..d99d3f3009b 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Activator.cpp
  *
- *  $Id$
- *
  *   Implementation of <ServantActivator_i>, which is used by a POA
  *   with a RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
index 254def99c1e..ebddca4b829 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Activator.h
  *
- *  $Id$
- *
  *   Defines a <ServantActivator_i> class, which uses a
  *   Servant_Manager to activate a servant by loading it and
  *   associates it with an object on-demand.
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp
index 2ba068c0267..9baa1dab59d 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Locator.cpp
  *
- *  $Id$
- *
  *   Implementation of ServantLocator_i class, used with a POA
  *   having a NON_RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
index a75819b1bc1..5c760329ed1 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Locator.h
  *
- *  $Id$
- *
  *   Defines a ServantLocator_i class , used with a POA having
  *   a NON_RETAIN policy.
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index edff944b13b..d9b7c112489 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Servant_Manager.cpp
  *
- *  $Id$
- *
  *   Implementation of the helper class for the ServantActivator_i
  *   and the ServantLocator_i.
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
index 3177f0b3964..b4201397f26 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Servant_Manager.h
  *
- *  $Id$
- *
  *   Helper class for <ServantActivator_i> and <ServantLoactor_i>.
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
index 2aa642ce766..6f635ae84f2 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -4,8 +4,6 @@
 /**
  *  @file     Server_Manager.h
  *
- *  $Id$
- *
  *   Helper class for the server application.
  *
  *
diff --git a/TAO/tests/POA/On_Demand_Loading/server.cpp b/TAO/tests/POA/On_Demand_Loading/server.cpp
index 809eccba1fa..73da04b56fb 100644
--- a/TAO/tests/POA/On_Demand_Loading/server.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     server.cpp
  *
- *  $Id$
- *
  *   Server application to test the Servant Activator and Servant Locator.
  *
  *
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
index 478e8a81e27..c2a54dfc0e1 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     POAManagerFactory.cpp
  *
- *  $Id$
- *
  *   This program tests Root_POA::the_POAManagerFactory and
  *   the POAManagerFactory interfaces such as create_POAManager(),
  *   list () and find ().
diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
index 2fd60b0a6e6..a6b319b91e0 100644
--- a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    POA_BiDir.cpp
  *
- *  $Id$
- *
  *  This program is an extension of $TAO_ROOT/example/POA/NewPOA. In
  *  the many POA's created this example adds a BiDirGIOP policy to
  *  one of the POA's.
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index 38df305afdb..3f86e71da9c 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     POA_Destruction.cpp
  *
- *  $Id$
- *
  *   This program tests the destruction of a POA while there is an
  *   upcall in progress.
  *
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 8bf6bd1c5e1..6827aa0d12e 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     client.cpp
  *
- *  $Id$
- *
  *   This is a client implementation.
  *
  *
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 1cd8c0efd39..dd8ea299657 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  In this example of using Persistent IDs.
  *
  *
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 38751511447..635128b5164 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Policies.cpp
  *
- *  $Id$
- *
  *   This program tests the construction of POA policies, both
  *   through the generic ORB::create_policy interface and the
  *   PortableServer specific interfaces.
diff --git a/TAO/tests/POA/Reference_Counted_Servant/server.cpp b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
index e11da6ae7f1..58009816ebd 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  This example shows how to use reference counted servants to
  *  automatically manage dynamic memory for servants.
  *  Stubs/Skeletons and client code is available in
diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp
index be973d012ad..65676df086a 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.cpp
+++ b/TAO/tests/POA/RootPOA/RootPOA.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     RootPOA.cpp
  *
- *  $Id$
- *
  *   This program gets the name of the Root POA and prints it out on
  *   the standard output.
  *
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index 504889b7319..005ecb86609 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     Single_Threaded_POA.cpp
  *
- *  $Id$
- *
  *   This program tests to make sure that two threads cannot call
  *   servants in a single threaded POA simultaneously. At the same
  *   time, it makes sure that a servant can call itself or other
diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp
index 0dd7cf83ba7..48497d056c9 100644
--- a/TAO/tests/POA/TIE/client.cpp
+++ b/TAO/tests/POA/TIE/client.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     client.cpp
  *
- *  $Id$
- *
  *   This is a simple client implementation.
  *
  *
diff --git a/TAO/tests/POA/TIE/server.cpp b/TAO/tests/POA/TIE/server.cpp
index 9a152af4997..3bf41a3fdeb 100644
--- a/TAO/tests/POA/TIE/server.cpp
+++ b/TAO/tests/POA/TIE/server.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file    server.cpp
  *
- *  $Id$
- *
  *  In this example,
  *
  *
diff --git a/TAO/tests/POA/TIE/test_i.cpp b/TAO/tests/POA/TIE/test_i.cpp
index 016e58330fa..b557bb3c8bb 100644
--- a/TAO/tests/POA/TIE/test_i.cpp
+++ b/TAO/tests/POA/TIE/test_i.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     test_i.cpp
  *
- *  $Id$
- *
  *   This is a simple test servant implementation
  *
  *
diff --git a/TAO/tests/POA/TIE/test_i.h b/TAO/tests/POA/TIE/test_i.h
index 534b44c29f5..ca324535d98 100644
--- a/TAO/tests/POA/TIE/test_i.h
+++ b/TAO/tests/POA/TIE/test_i.h
@@ -4,8 +4,6 @@
 /**
  *  @file     test_i.h
  *
- *  $Id$
- *
  *   Defines implementation classes for the interfaces
  *
  *
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index c4a9224f105..ab979c657f9 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -3,8 +3,6 @@
 /**
  *  @file     wait_for_completion.cpp
  *
- *  $Id$
- *
  *   This program tests the wait_for_completion feature of a POA.
  *
  *