Zapped c-style id tag with no space between // and $Id$

55 files changed, 0 insertions, 85 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
index b1246c2038f..1fb777c5287 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "utils.h"
 #include "ImplRepoC.h"
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h
index 7bfde174184..2ee0eb7f7be 100644
--- a/TAO/orbsvcs/ImplRepo_Service/utils.h
+++ b/TAO/orbsvcs/ImplRepo_Service/utils.h
@@ -1,4 +1,3 @@
-//$Id$
 #ifndef TAO_IMR_UTILS_H
 #define TAO_IMR_UTILS_H
 
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index dc1a8b7e137..d6b47ebfb34 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "orbsvcs/Log_Macros.h"
 #include "Notify_Logging_Service.h"
 #include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
index 9a51388965d..2be113473a0 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*IDL): taoidldefaults {
   IDL_Files {
     Manager.idl
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl b/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
index 3b01e2ff7e3..49106eab929 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
@@ -1,4 +1,3 @@
-//$Id$
 interface Manager
 {
   long registerServer();
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl b/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
index 421512c8587..07edf850ee7 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
@@ -1,4 +1,3 @@
-//$Id$
 interface Messenger
 {
   long send_message(in long thread, in long iter, in long obj, in long req);
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 873f7247f16..effc8779607 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "TestClient.h"
 #include "MessengerC.h"
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
index ad683187566..4161ef49d15 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
@@ -1,4 +1,3 @@
-//$Id$
 #include "tao/ORB.h"
 
 #include "ace/Task.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index b833848d930..d81bf00deaf 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "TestServer.h"
 
 #include "ManagerC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
index 666f526a014..b3e200d3786 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
@@ -1,4 +1,3 @@
-//$Id$
 #include "Messenger_i.h"
 
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
index 2990cc0b6f0..21cc54857b5 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "TestClient.h"
 
 #include <ace/streams.h>
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
index 11f615ec393..a8282880ebc 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "Manager_i.h"
 
 #include <ace/Get_Opt.h>
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
index c6118e25d69..d6e50f32682 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "TestServer.h"
 
 #include <ace/streams.h>
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index 2f1c2b82780..075e7306e56 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Gateway_i.h"
 
 #include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 52d41076d35..47774c8921e 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 #ifndef SERVER_IORINTERCEPTOR_H
 #define SERVER_IORINTERCEPTOR_H
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 2a138f62d96..b1feb2a1270 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef TAO_AV_FLOWS_T_CPP
 #define TAO_AV_FLOWS_T_CPP
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
index 79d91842ae2..a5388d36240 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
@@ -1,4 +1,3 @@
-//$Id$
 /*
  * Copyright (c) 1995 Regents of the University of California.
  * All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index 144c2290bbe..8aea23a1f02 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -1,4 +1,3 @@
-//$Id$
 // FT.idl
 #ifndef _FT_IDL_
 #define _FT_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
index 6503eb969a5..60d346ec8a5 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
@@ -1,4 +1,3 @@
-//$Id$
 #ifndef TAO_FT_CORBA_ORB_IDL
 #define TAO_FT_CORBA_ORB_IDL
 
diff --git a/TAO/orbsvcs/orbsvcs/FT_Replica.idl b/TAO/orbsvcs/orbsvcs/FT_Replica.idl
index eb351729e6e..1048b513515 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Replica.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_Replica.idl
@@ -1,4 +1,3 @@
-//$Id$
 // FT_replica.idl
 #ifndef _FT_REPLICA_IDL_
 #define _FT_REPLICA_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index c0b366020ae..a71f1d99935 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 1fc06596f71..1f7bdb40107 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
index 5e3a8417714..2c4dfc673ce 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index b7d45633400..75e3b09891d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
 
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index 15006251244..4d0c634a2a0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index e0db83257a5..56f1375fc9b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/FtRtEvent/Utils/Log.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 0a67dc6a12d..8e717c86814 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "orbsvcs/FtRtEvent/Utils/UUID.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 9f8ecb8fced..9e327e5fcc5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index e1629d6a0b5..3cdc82216da 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -2,8 +2,6 @@
 /**
  *  @file    DynSched.cpp
  *
- *  $Id$
- *
  *  @author Chris Gill
  */
 //=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index b93aa99c58b..d5b383829f8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -4,8 +4,6 @@
 /**
  *  @file    DynSched.h
  *
- *  $Id$
- *
  *  @author Chris Gill
  */
 //=============================================================================
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 4e43658781e..e04a1d22fcd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Connection_Manager.h"
 
 Connection_Manager::Connection_Manager (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index e19477d0dc4..c3639d2f62e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Connection_Manager.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index c8b003d22a4..37148f5d58f 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "TimeModuleS.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
index e4d8195ffbd..f5aef167ac0 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "Server_Task.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc b/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
index f78ee0c0f12..8a5ec6c6366 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
@@ -1,4 +1,3 @@
-//$Id$
 project(*Timeout): orbsvcsexe, naming, event, event_skel, messaging, threads {
   exename = TimeoutTest
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
index f154942bbb7..b76d4929a3a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
@@ -1,5 +1,4 @@
 // -*- IDL -*-
-//$Id$
 #include "tao/PortableInterceptor.pidl"
 #include "tao/PI_Server/PI_Server_include.pidl"
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index a70dbe81524..90958d5b065 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "Manager.h"
 #include "Client_i.h"
 #include "testC.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
index 1e949a91aa5..0835d37f395 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
@@ -1,4 +1,3 @@
-//$Id$
 // -*- C++ -*-
 
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
index 1e949a91aa5..0835d37f395 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
@@ -1,4 +1,3 @@
-//$Id$
 // -*- C++ -*-
 
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index bb111e54370..56a3172182b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 779bde188e6..6dfcd5110ac 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 3c680ff8717..e4629650d00 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 904a3a3a3f5..94410f0448c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 2de58de6f29..246a7d81f20 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 1db133780ce..e65237bdb92 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index c27af8a8979..ddd0ad8f9ac 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index cb23b49b2b2..a3326305bcb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index d46024acacc..65dc9125add 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "../lib/Notify_Test_Client.h"
 #include "orbsvcs/NotifyExtC.h"
 #include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 4c02db89fee..94f5b14a568 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "../lib/Driver.h"
 #include "ace/OS_main.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
index e8ac5a5b9dc..62f08c874bb 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
@@ -1,6 +1,4 @@
 /* -*- C++ -*- */
-//$Id$
-
 #ifndef TEST_TOPOLOGY_FACTORY_H
 #define TEST_TOPOLOGY_FACTORY_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index a8c48427f85..7bc87083d6d 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Consumer.h"
 #include "tao/debug.h"
 #include "tao/PortableServer/PortableServerC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 83a78e4a669..8df27bf97d5 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Supplier.h"
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
index aa20cd8a7d3..89e9ca09e88 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Task_Callback.h"
 
 TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index c9d1ee9c57b..89ee2135cd5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "Task_Stats.h"
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index ba9526204cd..d75072465e6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/High_Res_Timer.h"
 #include "ace/Log_Msg.h"