summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xACE/bin/zap_svn_id.pl4
-rw-r--r--ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc3
-rw-r--r--CIAO/performance-tests/Benchmark/LatencyTest.cpp3
-rw-r--r--CIAO/performance-tests/Benchmark/LatencyTest.h3
-rw-r--r--CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h3
-rw-r--r--CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp3
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h3
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl3
-rw-r--r--CIAO/tests/Cookies/Cookie.h3
-rw-r--r--CIAO/tests/Cookies/Test.idl3
-rw-r--r--TAO/TAO_IDL/be/be_scope.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_union_label.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp3
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_sequence.h3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Handler_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Quoter.idl3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Quoter.idl3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter.idl3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter.idl3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Client/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Quoter.idl3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h3
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/server.cpp3
-rw-r--r--TAO/docs/tutorials/Quoter/idl/Quoter.idl3
-rw-r--r--TAO/examples/AMH/Sink_Server/AMH_Servant.cpp3
-rw-r--r--TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp3
-rw-r--r--TAO/examples/AMH/Sink_Server/Test.idl3
-rw-r--r--TAO/examples/AMH/Sink_Server/client.cpp3
-rw-r--r--TAO/examples/AMI/FL_Callback/test.idl3
-rw-r--r--TAO/examples/Buffered_AMI/test.idl3
-rw-r--r--TAO/examples/Buffered_Oneways/test.idl3
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/test.idl3
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/test.idl3
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/test.idl3
-rw-r--r--TAO/examples/RTCORBA/Activity/Job.idl3
-rw-r--r--TAO/examples/RTScheduling/Job.idl3
-rw-r--r--TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp3
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h3
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/Stock.cpp3
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/Stock.h3
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp3
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/StockFactory.h3
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/Test.idl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl3
-rw-r--r--TAO/orbsvcs/orbsvcs/TimeBase.idl3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h3
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h3
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp3
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl3
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Hello.h3
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h3
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.h3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h3
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl3
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/status_i.cpp3
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/status_i.h3
-rw-r--r--TAO/performance-tests/Callback/callback.idl3
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp3
-rw-r--r--TAO/performance-tests/Latency/AMI/Server_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/AMI/Server_Task.h3
-rw-r--r--TAO/performance-tests/Latency/AMI/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Client_Task.h3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Server_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Server_Task.h3
-rw-r--r--TAO/performance-tests/Latency/Collocation/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/DII/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/DII/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/DII/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/DSI/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/DSI/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/DSI/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Deferred/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/Deferred/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/Deferred/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Test.idl3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp3
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h3
-rw-r--r--TAO/performance-tests/Memory/IORsize/Foo_i.h3
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp3
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp3
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h3
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Test.idl3
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Factory.cpp3
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Factory.h3
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Simple.cpp3
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Simple.h3
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Test.idl3
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test.idl3
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/test.idl3
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/client.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp3
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h3
-rw-r--r--TAO/performance-tests/Throughput/Receiver.cpp3
-rw-r--r--TAO/performance-tests/Throughput/Receiver.h3
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.cpp3
-rw-r--r--TAO/performance-tests/Throughput/Receiver_Factory.h3
-rw-r--r--TAO/performance-tests/Throughput/Test.idl3
-rw-r--r--TAO/tao/Monitor/Monitor_Impl.h3
-rw-r--r--TAO/tests/AMH_Exceptions/Test.idl3
-rw-r--r--TAO/tests/AMH_Oneway/Test.idl3
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering.cpp3
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering.h3
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp3
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h3
-rw-r--r--TAO/tests/AMI_Buffering/Client_Task.cpp3
-rw-r--r--TAO/tests/AMI_Buffering/Client_Task.h3
-rw-r--r--TAO/tests/AMI_Buffering/Reply_Handler.cpp3
-rw-r--r--TAO/tests/AMI_Buffering/Reply_Handler.h3
-rw-r--r--TAO/tests/AMI_Buffering/Test.idl3
-rw-r--r--TAO/tests/Any/Indirected/test.idl3
-rw-r--r--TAO/tests/Any/Recursive/Test.idl3
-rw-r--r--TAO/tests/BiDirectional/test.idl3
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/test.idl3
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/test.idl3
-rw-r--r--TAO/tests/Big_Oneways/Coordinator.cpp3
-rw-r--r--TAO/tests/Big_Oneways/Coordinator.h3
-rw-r--r--TAO/tests/Big_Oneways/Peer.cpp3
-rw-r--r--TAO/tests/Big_Oneways/Peer.h3
-rw-r--r--TAO/tests/Big_Oneways/Session.cpp3
-rw-r--r--TAO/tests/Big_Oneways/Session_Control.cpp3
-rw-r--r--TAO/tests/Big_Oneways/Session_Control.h3
-rw-r--r--TAO/tests/Big_Oneways/Session_Task.cpp3
-rw-r--r--TAO/tests/Big_Oneways/Session_Task.h3
-rw-r--r--TAO/tests/Big_Oneways/Test.idl3
-rw-r--r--TAO/tests/Big_Reply/Client_Task.cpp3
-rw-r--r--TAO/tests/Big_Reply/Client_Task.h3
-rw-r--r--TAO/tests/Big_Request_Muxing/Client_Task.cpp3
-rw-r--r--TAO/tests/Big_Request_Muxing/Client_Task.h3
-rw-r--r--TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp3
-rw-r--r--TAO/tests/Big_Request_Muxing/Payload_Receiver.h3
-rw-r--r--TAO/tests/Big_Request_Muxing/Test.idl3
-rw-r--r--TAO/tests/Big_Twoways/Coordinator.cpp3
-rw-r--r--TAO/tests/Big_Twoways/Coordinator.h3
-rw-r--r--TAO/tests/Big_Twoways/Peer.cpp3
-rw-r--r--TAO/tests/Big_Twoways/Peer.h3
-rw-r--r--TAO/tests/Big_Twoways/Session.cpp3
-rw-r--r--TAO/tests/Big_Twoways/Session_Control.cpp3
-rw-r--r--TAO/tests/Big_Twoways/Session_Control.h3
-rw-r--r--TAO/tests/Big_Twoways/Session_Task.cpp3
-rw-r--r--TAO/tests/Big_Twoways/Session_Task.h3
-rw-r--r--TAO/tests/Big_Twoways/Test.idl3
-rw-r--r--TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp3
-rw-r--r--TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h3
-rw-r--r--TAO/tests/Blocking_Sync_None/Test.idl3
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_1020_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_1254_Regression/BlobServer.cpp3
-rw-r--r--TAO/tests/Bug_1254_Regression/BlobServer.h3
-rw-r--r--TAO/tests/Bug_1330_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_1330_Regression/Test_i.cpp3
-rw-r--r--TAO/tests/Bug_1330_Regression/Test_i.h3
-rw-r--r--TAO/tests/Bug_1330_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_1330_Regression/server.cpp3
-rw-r--r--TAO/tests/Bug_1476_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_1476_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_1476_Regression/Server_Task.cpp3
-rw-r--r--TAO/tests/Bug_1476_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_1476_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_1476_Test/Hello.idl3
-rw-r--r--TAO/tests/Bug_1482_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_1482_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_1482_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_1482_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_1482_Regression/Server_Task.cpp3
-rw-r--r--TAO/tests/Bug_1482_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_1482_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Bug_1535_Regression/Test.cpp3
-rw-r--r--TAO/tests/Bug_1535_Regression/Test.h3
-rw-r--r--TAO/tests/Bug_1551_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_1551_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_1551_Regression/Reply_Handler.h3
-rw-r--r--TAO/tests/Bug_1551_Regression/Server_Task.cpp3
-rw-r--r--TAO/tests/Bug_1551_Regression/Server_Task.h3
-rw-r--r--TAO/tests/Bug_1551_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_1551_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_1627_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_1627_Regression/Test_i.cpp3
-rw-r--r--TAO/tests/Bug_1627_Regression/Test_i.h3
-rw-r--r--TAO/tests/Bug_1627_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_1627_Regression/server.cpp3
-rw-r--r--TAO/tests/Bug_1628_Regression/TestCase.idl3
-rw-r--r--TAO/tests/Bug_1628_Regression/TestType.idl3
-rw-r--r--TAO/tests/Bug_1635_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_1636_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_1636_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_1639_Regression/struct.idl3
-rw-r--r--TAO/tests/Bug_1639_Regression/struct_client.cpp3
-rw-r--r--TAO/tests/Bug_1676_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_1676_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_2084_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/EventNode.cpp3
-rw-r--r--TAO/tests/Bug_2084_Regression/EventNode.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2084_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2084_Regression/Server_Task.cpp3
-rw-r--r--TAO/tests/Bug_2084_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2144_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_2174_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_2183_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2183_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2183_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2186_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2186_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2186_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2188_Regression/broken.idl3
-rw-r--r--TAO/tests/Bug_2241_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_2241_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_2241_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2241_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2241_Regression/Server_Task.cpp3
-rw-r--r--TAO/tests/Bug_2241_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp3
-rw-r--r--TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h3
-rw-r--r--TAO/tests/Bug_2289_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_2289_Regression/server.cpp3
-rw-r--r--TAO/tests/Bug_2319_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2328_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2328_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2328_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2494_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_2560_Regression/Quoter.idl3
-rw-r--r--TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp3
-rw-r--r--TAO/tests/Bug_2560_Regression/Stock_Factory_i.h3
-rw-r--r--TAO/tests/Bug_2560_Regression/Stock_i.cpp3
-rw-r--r--TAO/tests/Bug_2560_Regression/Stock_i.h3
-rw-r--r--TAO/tests/Bug_2560_Regression/client.cpp3
-rw-r--r--TAO/tests/Bug_2560_Regression/server.cpp3
-rw-r--r--TAO/tests/Bug_2593_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2593_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2593_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2595_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_2595_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2683_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2683_Regression/test_i.cpp3
-rw-r--r--TAO/tests/Bug_2683_Regression/test_i.h3
-rw-r--r--TAO/tests/Bug_2702_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2734_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_2768_Regression/Messenger.idl3
-rw-r--r--TAO/tests/Bug_2804_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2844_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2953_Regression/Client_Task.cpp3
-rw-r--r--TAO/tests/Bug_2953_Regression/Client_Task.h3
-rw-r--r--TAO/tests/Bug_2953_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_2966_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_2966_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3000_Regression/Callback.cpp3
-rw-r--r--TAO/tests/Bug_3000_Regression/Callback.h3
-rw-r--r--TAO/tests/Bug_3000_Regression/Service.cpp3
-rw-r--r--TAO/tests/Bug_3000_Regression/Service.h3
-rw-r--r--TAO/tests/Bug_3000_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3068_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_3163_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_3299_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3299_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3333_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3333_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3333_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3430_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3430_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3430_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3471_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3471_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3471_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3479_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3479_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3479_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3531_Regression/test.idl3
-rw-r--r--TAO/tests/Bug_3552_Regression/struct.idl3
-rw-r--r--TAO/tests/Bug_3553_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3553_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3553_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3558_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3558_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3558_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3598a_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3598a_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3598a_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3636_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3636_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3636_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3647_Regression/Backend_Impl.h3
-rw-r--r--TAO/tests/Bug_3647_Regression/Middle_Impl.h3
-rw-r--r--TAO/tests/Bug_3676_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3676_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3676_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3743_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3746_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3746_Regression/Test_i.cpp3
-rw-r--r--TAO/tests/Bug_3746_Regression/Test_i.h3
-rw-r--r--TAO/tests/Bug_3748_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3748_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Bug_3748_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp3
-rw-r--r--TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h3
-rw-r--r--TAO/tests/Bug_3790_Regression/simple_test_i.cpp3
-rw-r--r--TAO/tests/Bug_3790_Regression/simple_test_i.h3
-rw-r--r--TAO/tests/Bug_3837_Regression/Hello.cpp3
-rw-r--r--TAO/tests/Bug_3837_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3837_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Bug_3853_Regression/Hello.idl3
-rw-r--r--TAO/tests/Bug_3853_Regression/Hello_i.h3
-rw-r--r--TAO/tests/Bug_3896_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3896_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3919_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_3954_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_3954_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_4010_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_4010_Regression/Test.idl3
-rw-r--r--TAO/tests/Bug_4059_Regression/Hello.h3
-rw-r--r--TAO/tests/Bug_4059_Regression/Test.idl3
-rw-r--r--TAO/tests/COIOP/Client_Task.h3
-rw-r--r--TAO/tests/COIOP/Hello.h3
-rw-r--r--TAO/tests/COIOP/Test.idl3
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp3
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/Hello.h3
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/Test.idl3
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp3
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h3
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl3
-rw-r--r--TAO/tests/Cache_Growth_Test/Hello.cpp3
-rw-r--r--TAO/tests/Cache_Growth_Test/Hello.h3
-rw-r--r--TAO/tests/Cache_Growth_Test/Test.idl3
-rw-r--r--TAO/tests/CallbackTest/Callback.cpp3
-rw-r--r--TAO/tests/CallbackTest/Callback.h3
-rw-r--r--TAO/tests/CallbackTest/Service.cpp3
-rw-r--r--TAO/tests/CallbackTest/Service.h3
-rw-r--r--TAO/tests/CallbackTest/Test.idl3
-rw-r--r--TAO/tests/ClientPortSpan/Hello.h3
-rw-r--r--TAO/tests/ClientPortSpan/Test.idl3
-rw-r--r--TAO/tests/Client_Leaks/Client_Task.cpp3
-rw-r--r--TAO/tests/Client_Leaks/Client_Task.h3
-rw-r--r--TAO/tests/Client_Leaks/Process.cpp3
-rw-r--r--TAO/tests/Client_Leaks/Process.h3
-rw-r--r--TAO/tests/Client_Leaks/Process_Factory.cpp3
-rw-r--r--TAO/tests/Client_Leaks/Process_Factory.h3
-rw-r--r--TAO/tests/Client_Leaks/Server_Task.cpp3
-rw-r--r--TAO/tests/Client_Leaks/Server_Task.h3
-rw-r--r--TAO/tests/Client_Leaks/Startup_Callback.cpp3
-rw-r--r--TAO/tests/Client_Leaks/Startup_Callback.h3
-rw-r--r--TAO/tests/Client_Leaks/Test.idl3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Test.idl3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Test.idl3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Test.idl3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Hello.h3
-rw-r--r--TAO/tests/Collocated_DerivedIF/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_NoColl/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_NoColl/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_NoColl/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_NoColl/Hello.h3
-rw-r--r--TAO/tests/Collocated_NoColl/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_NoColl/Test.idl3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Hello.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Test.idl3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Test.idl3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Client_Task.h3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Hello.cpp3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Hello.h3
-rw-r--r--TAO/tests/Collocation_Exception_Test/Test.idl3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Client_Task.h3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Hello.cpp3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Hello.h3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Test.idl3
-rw-r--r--TAO/tests/Collocation_Opportunities/test.idl3
-rw-r--r--TAO/tests/Collocation_Tests/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocation_Tests/Client_Task.h3
-rw-r--r--TAO/tests/Collocation_Tests/Hello.cpp3
-rw-r--r--TAO/tests/Collocation_Tests/Hello.h3
-rw-r--r--TAO/tests/Collocation_Tests/Server_Task.cpp3
-rw-r--r--TAO/tests/Collocation_Tests/Test.idl3
-rw-r--r--TAO/tests/Connect_Strategy_Test/Hello.cpp3
-rw-r--r--TAO/tests/Connect_Strategy_Test/Hello.h3
-rw-r--r--TAO/tests/Connect_Strategy_Test/Test.idl3
-rw-r--r--TAO/tests/Connection_Failure/test.idl3
-rw-r--r--TAO/tests/Connection_Purging/test_i.cpp3
-rw-r--r--TAO/tests/Connection_Purging/test_i.h3
-rw-r--r--TAO/tests/Connection_Timeout/Test.idl3
-rw-r--r--TAO/tests/Crash_On_Write/Crash_Task.cpp3
-rw-r--r--TAO/tests/Crash_On_Write/Crash_Task.h3
-rw-r--r--TAO/tests/Crash_On_Write/Oneway_Receiver.cpp3
-rw-r--r--TAO/tests/Crash_On_Write/Oneway_Receiver.h3
-rw-r--r--TAO/tests/Crash_On_Write/Test.idl3
-rw-r--r--TAO/tests/Crashed_Callback/Crashed_Callback.cpp3
-rw-r--r--TAO/tests/Crashed_Callback/Crashed_Callback.h3
-rw-r--r--TAO/tests/Crashed_Callback/Service.cpp3
-rw-r--r--TAO/tests/Crashed_Callback/Service.h3
-rw-r--r--TAO/tests/Crashed_Callback/Test.idl3
-rw-r--r--TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc3
-rw-r--r--TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp3
-rw-r--r--TAO/tests/DII_AMI_Forward/DII_ReplyHandler.h3
-rw-r--r--TAO/tests/DII_AMI_Forward/orb_initializer.cpp3
-rw-r--r--TAO/tests/DII_AMI_Forward/orb_initializer.h3
-rw-r--r--TAO/tests/DII_AMI_Forward/server.cpp3
-rw-r--r--TAO/tests/DII_AMI_Forward/test_i.cpp3
-rw-r--r--TAO/tests/DII_AMI_Forward/test_i.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Hello.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Test.idl3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Hello.h3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp3
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Test.idl3
-rw-r--r--TAO/tests/DSI_AMH/Roundtrip.cpp3
-rw-r--r--TAO/tests/DSI_AMH/Roundtrip.h3
-rw-r--r--TAO/tests/DSI_AMH/Test.idl3
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test.idl3
-rw-r--r--TAO/tests/DSI_Gateway/test.idl3
-rw-r--r--TAO/tests/DiffServ/test.idl3
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Test.idl3
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp3
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Test.idl3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h3
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Test.idl3
-rw-r--r--TAO/tests/FL_Cube/test.idl3
-rw-r--r--TAO/tests/Faults/test.idl3
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp3
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h3
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp3
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h3
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/Test.idl3
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp3
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h3
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/Test.idl3
-rw-r--r--TAO/tests/Hang_Shutdown/test_i.h3
-rw-r--r--TAO/tests/Hello/Hello.h3
-rw-r--r--TAO/tests/Hello/Test.idl3
-rw-r--r--TAO/tests/ICMG_Any_Bug/Hello.cpp3
-rw-r--r--TAO/tests/ICMG_Any_Bug/Hello.h3
-rw-r--r--TAO/tests/ICMG_Any_Bug/HelloWorld.cpp3
-rw-r--r--TAO/tests/ICMG_Any_Bug/HelloWorld.h3
-rw-r--r--TAO/tests/ICMG_Any_Bug/Test.idl3
-rw-r--r--TAO/tests/IORTable_Locator/simple_test_i.cpp3
-rw-r--r--TAO/tests/IORTable_Locator/simple_test_i.h3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/bogus.idl3
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h3
-rw-r--r--TAO/tests/IPV6/Hello.cpp3
-rw-r--r--TAO/tests/IPV6/Hello.h3
-rw-r--r--TAO/tests/IPV6/Test.idl3
-rw-r--r--TAO/tests/Leader_Followers/test.idl3
-rw-r--r--TAO/tests/LongDouble/Global.cpp3
-rw-r--r--TAO/tests/LongDouble/LongDoubleTest.h3
-rw-r--r--TAO/tests/LongDouble/Test.idl3
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.cpp3
-rw-r--r--TAO/tests/LongUpcalls/Controller.cpp3
-rw-r--r--TAO/tests/LongUpcalls/Manager.cpp3
-rw-r--r--TAO/tests/LongUpcalls/Manager.h3
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.cpp3
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.h3
-rw-r--r--TAO/tests/MT_BiDir/Client_Task.cpp3
-rw-r--r--TAO/tests/MT_BiDir/Client_Task.h3
-rw-r--r--TAO/tests/MT_BiDir/Receiver.idl3
-rw-r--r--TAO/tests/MT_BiDir/Receiver_i.cpp3
-rw-r--r--TAO/tests/MT_BiDir/Receiver_i.h3
-rw-r--r--TAO/tests/MT_BiDir/Sender.idl3
-rw-r--r--TAO/tests/MT_BiDir/Server_Task.cpp3
-rw-r--r--TAO/tests/MT_Server/test.idl3
-rw-r--r--TAO/tests/MT_Timeout/Client_Task.cpp3
-rw-r--r--TAO/tests/MT_Timeout/Client_Task.h3
-rw-r--r--TAO/tests/MT_Timeout/Server_Task.cpp3
-rw-r--r--TAO/tests/MT_Timeout/Server_Task.h3
-rw-r--r--TAO/tests/MT_Timeout/Sleep_Service.cpp3
-rw-r--r--TAO/tests/MT_Timeout/Sleep_Service.h3
-rw-r--r--TAO/tests/MT_Timeout/Test.idl3
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h3
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Test.idl3
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/test.idl3
-rw-r--r--TAO/tests/Muxing/Client_Task.cpp3
-rw-r--r--TAO/tests/Muxing/Client_Task.h3
-rw-r--r--TAO/tests/Muxing/Receiver.cpp3
-rw-r--r--TAO/tests/Muxing/Receiver.h3
-rw-r--r--TAO/tests/Muxing/Server_Task.cpp3
-rw-r--r--TAO/tests/Muxing/Server_Task.h3
-rw-r--r--TAO/tests/Muxing/Test.idl3
-rw-r--r--TAO/tests/Native_Exceptions/test.idl3
-rw-r--r--TAO/tests/Nested_Event_Loop/test.idl3
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Client_Task.cpp3
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Client_Task.h3
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Server_Task.cpp3
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.idl3
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp3
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h3
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.h3
-rw-r--r--TAO/tests/ORB_shutdown/Test.idl3
-rw-r--r--TAO/tests/Object_Loader/driver.cpp3
-rw-r--r--TAO/tests/Ondemand_Write/Hello.h3
-rw-r--r--TAO/tests/Ondemand_Write/Test.idl3
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp3
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.h3
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp3
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h3
-rw-r--r--TAO/tests/Oneway_Buffering/Test.idl3
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp3
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Client_Task.h3
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp3
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Server_Task.h3
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Test.idl3
-rw-r--r--TAO/tests/POA/Deactivate_Object/Hello.cpp3
-rw-r--r--TAO/tests/POA/Deactivate_Object/Hello.h3
-rw-r--r--TAO/tests/POA/Deactivate_Object/Test.idl3
-rw-r--r--TAO/tests/POA/EndpointPolicy/Hello.cpp3
-rw-r--r--TAO/tests/POA/EndpointPolicy/Hello.h3
-rw-r--r--TAO/tests/POA/EndpointPolicy/Test.idl3
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h3
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp3
-rw-r--r--TAO/tests/POA/Reference_Counting/Hello.idl3
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/Test.idl3
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/Test_i.cpp3
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/Test_i.h3
-rw-r--r--TAO/tests/Policies/test.idl3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Hello.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Test.idl3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp3
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h3
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp3
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h3
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Diffserv/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/test.idl3
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/test.idl3
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/test.idl3
-rw-r--r--TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp3
-rw-r--r--TAO/tests/Reliable_Oneways/Oneway_Receiver.h3
-rw-r--r--TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp3
-rw-r--r--TAO/tests/Reliable_Oneways/Shutdown_Helper.h3
-rw-r--r--TAO/tests/Reliable_Oneways/Test.idl3
-rw-r--r--TAO/tests/Servant_To_Reference_Test/Test.idl3
-rw-r--r--TAO/tests/Servant_To_Reference_Test/Test_i.cpp3
-rw-r--r--TAO/tests/Servant_To_Reference_Test/Test_i.h3
-rw-r--r--TAO/tests/Server_Connection_Purging/Test_i.cpp3
-rw-r--r--TAO/tests/Server_Connection_Purging/Test_i.h3
-rw-r--r--TAO/tests/Server_Leaks/Ping_Service.cpp3
-rw-r--r--TAO/tests/Server_Leaks/Ping_Service.h3
-rw-r--r--TAO/tests/Server_Leaks/Test.idl3
-rw-r--r--TAO/tests/Server_Port_Zero/Hello.cpp3
-rw-r--r--TAO/tests/Server_Port_Zero/Hello.h3
-rw-r--r--TAO/tests/Server_Port_Zero/Test.idl3
-rw-r--r--TAO/tests/Single_Read/test.idl3
-rw-r--r--TAO/tests/Skeleton_Inheritance/idl_1.idl3
-rw-r--r--TAO/tests/Skeleton_Inheritance/idl_2.idl3
-rw-r--r--TAO/tests/Skeleton_Inheritance/idl_3.idl3
-rw-r--r--TAO/tests/Skeleton_Inheritance/interface_3_i.h3
-rw-r--r--TAO/tests/Stack_Recursion/Client_Task.cpp3
-rw-r--r--TAO/tests/Stack_Recursion/Client_Task.h3
-rw-r--r--TAO/tests/Stack_Recursion/Sender.cpp3
-rw-r--r--TAO/tests/Stack_Recursion/Sender.h3
-rw-r--r--TAO/tests/Stack_Recursion/Server_Task.cpp3
-rw-r--r--TAO/tests/Stack_Recursion/Server_Task.h3
-rw-r--r--TAO/tests/Stack_Recursion/Test.idl3
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/test.idl3
-rw-r--r--TAO/tests/Timeout/test.idl3
-rw-r--r--TAO/tests/Two_Objects/First_i.cpp3
-rw-r--r--TAO/tests/Two_Objects/Object_Factory_i.cpp3
-rw-r--r--TAO/tests/Two_Objects/Two_Objects.idl3
-rw-r--r--TAO/tests/Two_Objects/worker.cpp3
-rw-r--r--TAO/tests/UNKNOWN_Exception/test.idl3
-rw-r--r--TAO/tests/ZIOP/Hello.cpp3
-rw-r--r--TAO/tests/ZIOP/Hello.h3
-rw-r--r--TAO/tests/ZIOP/Test.idl3
826 files changed, 4 insertions, 2475 deletions
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 3e6ec5835c6..b02fd84fa0b 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -14,5 +14,9 @@ eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
# Taken from perlrun man page.
#undef $/; $s = <>; $s =~ s/ \*\n \* \$Id\$\n \*\n/ \*\n/m; print $s
+# Replace a three line doxygen style Id tag with just line *
BEGIN{undef $/;} s/ \*\n \* \$Id\$\n \*\n/ \*\n/smg;
+# Replace a three line c-style id tag with an empty line below that with nothing
+BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n\/\/\n\n//smg;
+# Replace a three line c-style id tag with nothing
BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n\/\/\n//smg;
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc b/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
index b91c55e9763..2eb03f7d71a 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc
@@ -1,7 +1,4 @@
// -*- MPC -*-
-//
-// $Id$
-//
project(*server): aceexe, htbp {
exename = server
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
index 2de09618b8f..5eded25989a 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "LatencyTest.h"
LatencyTest::LatencyTest (CORBA::ORB_ptr orb)
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.h b/CIAO/performance-tests/Benchmark/LatencyTest.h
index bafda6e76c0..be6f15036ca 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LATENCYTEST_H
#define LATENCYTEST_H
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h
index e3330a76307..9f294760089 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 9cfc951f332..93c1658ccbd 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
//==============================================================
/**
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
index e2dbaf7cc0e..891a26697a5 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LATENCYTEST_H
#define LATENCYTEST_H
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl b/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
index 57af615669e..77340766da3 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Measure roundtrip delay
interface LatencyTest
diff --git a/CIAO/tests/Cookies/Cookie.h b/CIAO/tests/Cookies/Cookie.h
index 6812955f8cb..9975f62c69a 100644
--- a/CIAO/tests/Cookies/Cookie.h
+++ b/CIAO/tests/Cookies/Cookie.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/CIAO/tests/Cookies/Test.idl b/CIAO/tests/Cookies/Test.idl
index 05c714f03f2..ec5c75b3a6a 100644
--- a/CIAO/tests/Cookies/Test.idl
+++ b/CIAO/tests/Cookies/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ccm/CCM_Cookie.idl"
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
index cd1381b1d03..90439922ea7 100644
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ b/TAO/TAO_IDL/be/be_scope.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "be_scope.h"
#include "be_valuetype.h"
#include "be_eventtype.h"
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
index af2906934d8..9d0cd9f3c84 100644
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ b/TAO/TAO_IDL/be/be_union_label.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "be_union_label.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 63d3d67e104..f585aeada96 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// ============================================================================
//
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence.h b/TAO/TAO_IDL/be_include/be_visitor_sequence.h
index 92dd035bca4..be33af2bc6f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence.h
@@ -1,7 +1,4 @@
/* -*- c++ -*- */
-//
-// $Id$
-//
#ifndef TAO_BE_VISITOR_SEQUENCE_H
#define TAO_BE_VISITOR_SEQUENCE_H
diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp b/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
index 0b8372fd3f3..168dc2d222c 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Handler_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
index 09890b758f1..1d12efe41f5 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIALS_QUOTER_AMI_CLIENT_HANDLER_I_H
#define TAO_TUTORIALS_QUOTER_AMI_CLIENT_HANDLER_I_H
diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter.idl b/TAO/docs/tutorials/Quoter/AMI/Quoter.idl
index 42adab03d66..83c7bb67ffa 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.cpp
index e09c66ed1a9..06a2f8bf9d1 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.h
index 715c7a8c5f2..58b88cb56bb 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/AMI/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/AMI/Stock_i.cpp b/TAO/docs/tutorials/Quoter/AMI/Stock_i.cpp
index d76f651348b..68237787d62 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/AMI/Stock_i.h b/TAO/docs/tutorials/Quoter/AMI/Stock_i.h
index 88a51548962..9efd6065891 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/AMI/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp
index e82a07f7b45..0aa4ff85106 100644
--- a/TAO/docs/tutorials/Quoter/AMI/client.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Handler_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp
index 3e9d85ba4cb..a751be49f3e 100644
--- a/TAO/docs/tutorials/Quoter/AMI/server.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index eb20cf8a400..7cf9c1ae5b9 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
#define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_CONSUMER_I_H
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter.idl b/TAO/docs/tutorials/Quoter/Event_Service/Quoter.idl
index 34d81177658..9742341166a 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 5bd630926c8..89ba45f3008 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Consumer.h"
#include "QuoterC.h"
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index 4c0fb2f1480..8fd4162b954 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
#define TAO_TUTORIALS_QUOTER_EVENT_SERVICE_STOCK_CONSUMER_H
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.cpp
index f6b7777e39c..bb439cae095 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
index 8620647f178..13761ed7419 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
index 7c4f3c1b059..9bc325773f4 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index 7c12a3b7aa6..fdac1364844 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_EVENT_SERVICE_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index 1ef4a0973da..747b8b9a03f 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Consumer.h"
#include <orbsvcs/CosNamingC.h>
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
index 1e7241f0a12..686dce55dba 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
index e09c66ed1a9..06a2f8bf9d1 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
index 715c7a8c5f2..58b88cb56bb 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
index be99840deab..0cb51fde154 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
index 9a58df1c966..189c8f618c9 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index 2f81d84abe7..1b3be9bd2ed 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "QuoterC.h"
#include <orbsvcs/CosNamingC.h>
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
index 3ea2f315b90..baab5b10738 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
index 0df4e1f7363..24f8d503a3a 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Handler_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
index 13109109c7f..7a7734f739a 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIALS_QUOTER_ONDEMAND_CLIENT_HANDLER_I_H
#define TAO_TUTORIALS_QUOTER_ONDEMAND_CLIENT_HANDLER_I_H
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter.idl b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter.idl
index 80cfa1661d1..b00c5b0b440 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 08f0b6e0145..5fd51694afd 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STOCK_FACTORY_LOCATOR_I_H
#define STOCK_FACTORY_LOCATOR_I_H
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
index b6565631432..103cddd216e 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
index 49d5a8b7c8e..746362c2a14 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
index 88a51548962..9efd6065891 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
index e82a07f7b45..0aa4ff85106 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Handler_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
index 5314c2284ef..09f2f8bb23d 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_Locator_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter.idl b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter.idl
index 34d81177658..9742341166a 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index 0753e39ebee..719a0810f78 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Consumer.h"
#include "QuoterC.h"
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 13ed858e93a..670b9829912 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
#define TAO_TUTORIALS_QUOTER_RT_EVENT_SERVICE_STOCK_CONSUMER_H
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.cpp
index b542c9fbe98..3dce10ad7e8 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
index b83777f0e17..b490c0968e1 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 6571d34544c..6d4318d4b02 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_RT_EVENT_SERVICE_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index bcd69672390..5b5f49fcd93 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Consumer.h"
#include <orbsvcs/CosNamingC.h>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
index 17dccb26536..d6844c4186d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
index 80020421014..fcadf491daa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// Include the generated names....
#include "QuoterC.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
index e09c66ed1a9..06a2f8bf9d1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
index 715c7a8c5f2..58b88cb56bb 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
index be99840deab..0cb51fde154 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
index 502655ec1fa..b4167e8a95a 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
index 80020421014..fcadf491daa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// Include the generated names....
#include "QuoterC.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
index 6a225a70048..5a3321dd472 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
index 4997fd8335f..d3d12c0b4f6 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_IMPROVEDSERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_IMPROVEDSERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
index be99840deab..0cb51fde154 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
index 4cbbf57f5a5..54b4b27e7ab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_IMPROVEDSERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_IMPROVEDSERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
index 9e452b34601..a2c32f89e4e 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
index e09c66ed1a9..06a2f8bf9d1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
index 715c7a8c5f2..58b88cb56bb 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
index be99840deab..0cb51fde154 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
index 502655ec1fa..b4167e8a95a 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
index 80020421014..fcadf491daa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// Include the generated names....
#include "QuoterC.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Quoter.idl b/TAO/docs/tutorials/Quoter/Simple/Quoter.idl
index 3129da38a4b..9ddc62258d5 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/Simple/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
index e09c66ed1a9..06a2f8bf9d1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
index 715c7a8c5f2..58b88cb56bb 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
index be99840deab..0cb51fde154 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
index f47b1c8184d..804b893172f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
index 7553ee5702b..9fa80224011 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "ace/streams.h"
diff --git a/TAO/docs/tutorials/Quoter/idl/Quoter.idl b/TAO/docs/tutorials/Quoter/idl/Quoter.idl
index b707539eea3..2d4eccacc8f 100644
--- a/TAO/docs/tutorials/Quoter/idl/Quoter.idl
+++ b/TAO/docs/tutorials/Quoter/idl/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index c6761e4d695..fa2aaabfe7f 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "AMH_Servant.h"
#include "Timer_Handler.h"
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index ac39d9958d4..33e6ccb54ab 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "MT_AMH_Server.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/examples/AMH/Sink_Server/Test.idl b/TAO/examples/AMH/Sink_Server/Test.idl
index dad54437056..c7b4aebc549 100644
--- a/TAO/examples/AMH/Sink_Server/Test.idl
+++ b/TAO/examples/AMH/Sink_Server/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index 2cbdaac57a3..7cb524bfb83 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/examples/AMI/FL_Callback/test.idl b/TAO/examples/AMI/FL_Callback/test.idl
index 87dead7906d..d1b1af6309a 100644
--- a/TAO/examples/AMI/FL_Callback/test.idl
+++ b/TAO/examples/AMI/FL_Callback/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Peer;
typedef sequence<Peer> PeerSet;
diff --git a/TAO/examples/Buffered_AMI/test.idl b/TAO/examples/Buffered_AMI/test.idl
index 2a1eca586b6..bf181a7c16f 100644
--- a/TAO/examples/Buffered_AMI/test.idl
+++ b/TAO/examples/Buffered_AMI/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/examples/Buffered_Oneways/test.idl b/TAO/examples/Buffered_Oneways/test.idl
index 460fe5b6cac..5f592df080a 100644
--- a/TAO/examples/Buffered_Oneways/test.idl
+++ b/TAO/examples/Buffered_Oneways/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test.idl b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test.idl
index deed5409437..54e291f3ea3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test.idl b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test.idl
index deed5409437..54e291f3ea3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test.idl b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test.idl
index deed5409437..54e291f3ea3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/examples/RTCORBA/Activity/Job.idl b/TAO/examples/RTCORBA/Activity/Job.idl
index f5117788b04..5394bbb1e66 100644
--- a/TAO/examples/RTCORBA/Activity/Job.idl
+++ b/TAO/examples/RTCORBA/Activity/Job.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Job
{
diff --git a/TAO/examples/RTScheduling/Job.idl b/TAO/examples/RTScheduling/Job.idl
index f1aab1c1074..25566e1e8b7 100644
--- a/TAO/examples/RTScheduling/Job.idl
+++ b/TAO/examples/RTScheduling/Job.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Job
{
diff --git a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
index 1fb820fe210..d2f36f04d3f 100644
--- a/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/orbix/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
index 45170534be6..1f166b93d43 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
index ad369d2b7ed..dd22dcc19d3 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Server_ORBInitializer.h"
#include "server_interceptor.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
index 6bffdffaf04..9554057647d 100644
--- a/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
+++ b/TAO/interop-tests/CdrOutArg/tao/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
index 5e23f3d9732..53c7dd0be35 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.h b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
index 1c9522acd68..b348be6e4c2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STOCK_H
#define STOCK_H
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index 8953bb542ac..adfb7e71d9a 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "StockFactory.h"
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 4edf6fb9952..17f030929c9 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STOCKFACTORY_H
#define STOCKFACTORY_H
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Test.idl b/TAO/orbsvcs/examples/LoadBalancing/Test.idl
index ea0cb943d44..0d2553df8c2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Test.idl
+++ b/TAO/orbsvcs/examples/LoadBalancing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index ba31135980a..e14aeb636d7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -1,7 +1,4 @@
// ============================================================================
-//
-// $Id$
-//
// ============================================================================
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
index a93a0002f14..374ebb64e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
@@ -1,9 +1,6 @@
// -*- C++ -*-
// ============================================================================
-//
-// $Id$
-//
// ============================================================================
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
index ede4dc7780d..c662025627e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
@@ -1,7 +1,4 @@
// ============================================================================
-//
-// $Id$
-//
// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/TimeBase.idl b/TAO/orbsvcs/orbsvcs/TimeBase.idl
index 40a51d7de8a..a40043d6c04 100644
--- a/TAO/orbsvcs/orbsvcs/TimeBase.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeBase.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef _TIME_BASE_IDL_
#define _TIME_BASE_IDL_
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
index f20041016a0..02c41a39012 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
index f20041016a0..02c41a39012 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index 92dce8ce091..aa2c400f3af 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
index 7e72f72bcb5..7ecc7ddc699 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index dc425ae9747..fc611073c89 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SESSION_H
#define SESSION_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index e91a2a57568..13665b0a280 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SESSION_FACTORY_H
#define SESSION_FACTORY_H
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
index 2b27d49688c..57a7a5c2958 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 82bc24276b5..d9abffac695 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/corba.h"
// Attempts to resolve the NameService.
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index be4e2d44eac..d9b3a0120e1 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 8414a6d3d2c..949168c1d71 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index ce818b72c04..aa5305f1866 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
index 1b66c41a709..aad83d030b5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index 1c7d9ff5608..df4990b3c12 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 6202345bde1..93461daa94d 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
index 9e1fa22e0be..61b56f2d3f7 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
index 23e2e601a64..2e0f3e265ce 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello_Impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
index f6900ca2e9b..303dcbb637a 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "HelloS.h"
#include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index f6e0c0122e1..b201c95b513 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Task.h"
#include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index dfa637f9960..33537d3fd5c 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ServerRequest_Interceptor2.h"
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index ca2bdccf0e6..5f48cef8b47 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
index dc6d9c82e4e..1611703e9b3 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
index 00a7f2ce48b..1a6c841d700 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SHUTDOWN_H
#define SHUTDOWN_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
index 9c94701468d..bd9e2c54acc 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello_Impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
index 092f55994b2..94cbd88d1c4 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "HelloS.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
index bd6e67c94b9..8b7c976dce5 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Task.h"
#include "ace/Mutex.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 56129a8e434..7c6ac21a3b1 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Get_Opt.h"
#include "orbsvcs/PortableGroup/GOA.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
index 185704c073d..81d7d7081fe 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
index 00d76318ae6..4650216060a 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
index 9e1fa22e0be..61b56f2d3f7 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
index c5463121e4f..d8c46266d98 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
index e605dee88f8..b068dbb391b 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
index 958e025a4cb..6e38a0ef68f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
index 04ad5ba319a..15d7b298abc 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
index af231fe1540..88fd5ffb5b8 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
index 00a7f2ce48b..1a6c841d700 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SHUTDOWN_H
#define SHUTDOWN_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
index 052df98670f..a096bc37133 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
index caf66622920..e5adde74096 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
index 509f618d3b8..189f408731f 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
index 9b3e442dbde..c5cab70f9d5 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "test_impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
index 4ad50da4557..25aad8e5c45 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef _TEST_IMPL_H_
#define _TEST_IMPL_H_
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index ff30844d186..d299fbe0924 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
index 38be7e2df24..0f02aee45e9 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
index 3048e6f95f7..4c63fd5a6f1 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl b/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
index 871ff05f9df..dc17be6fc03 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/data.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module ECM_IDLData
{
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
index f44811dcd02..62e0128ade6 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
ACE_INLINE int
ECM_Federation::sender_local_addr (ACE_INET_Addr& addr)
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
index 752bb07aa19..ec539001733 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl b/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
index 98ed1b2e3a3..4dc46ae668b 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
index 47ede657b9a..e085e2458e0 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index 085f99d3e35..5af5a0e8c4f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index a6c492ee005..2d7cfb2e5e0 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl b/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
index d6002892314..5d51be7d886 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
index bb278211006..0c870efaab4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface bug_689_regression
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
index e1325a2aa8b..b1693cd7f78 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Server_ORBInitializer.h"
#include "server_interceptor.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
index c1d0a17a924..ea652c725d0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
index 6e5d83ab0fc..e89e0b500d0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test {
typedef long ErrorType;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
index b1c414b33e7..d8c4133b4b0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "GoodDay.h"
GoodDay::GoodDay (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index cb35c06c610..0425c501516 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef GOODDAY_H
#define GOODDAY_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
index 2ede1277b90..63d350aa399 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
index c6f0b7e7654..b984ea371d5 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello_Impl.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
index 890ec58bd8e..ffa68678b76 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef _HELLOS_IMPL_H_
#define _HELLOS_IMPL_H_
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
index 28d5e5fe81b..4a97333f149 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Task.h"
#include "ace/Atomic_Op_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
index 045adfe7820..49cfc29a1ef 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 13c6cad7ed9..fa003a0b18e 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "McastHello.h"
McastHello::McastHello (CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MCASTHELLO_H
#define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Test.idl b/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
index d23e4fd3773..400c79e3753 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "McastHello.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MCASTHELLO_H
#define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl b/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
index f195a6e5c9a..7dd3173ccc4 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "McastHello.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
index c6a85237a95..45c93518e93 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MCASTHELLO_H
#define MCASTHELLO_H
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl b/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
index e3babc5d5a2..2cb7db0e214 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl b/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
index 4839f8a67b1..46833825dea 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
index 8e1ad8e0a71..43dd91c23b8 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "MessengerC.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
index e3a91380355..7faa37e6a74 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.idl b/TAO/orbsvcs/tests/Security/Callback/client.idl
index 9ac07bd3cd5..ae2d92d47ae 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.idl
+++ b/TAO/orbsvcs/tests/Security/Callback/client.idl
@@ -1,8 +1,5 @@
//
// Client interface definition.
-//
-// $Id$
-//
interface client
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.idl b/TAO/orbsvcs/tests/Security/Callback/server.idl
index 66e11c7fa4b..af1e82dd699 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.idl
+++ b/TAO/orbsvcs/tests/Security/Callback/server.idl
@@ -1,8 +1,5 @@
//
// Server interface definition.
-//
-// $Id$
-//
#include "client.idl"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 24d1baf9ead..27649c77a50 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
index 778e9618258..f0e94c59e2a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MT_BIDIR_CLIENT_TASK_H
#define MT_BIDIR_CLIENT_TASK_H
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
index b8e7383670e..693e0d5765a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Receiver
{
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
index 72b6bf4f7aa..900e505506a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver_i.h"
Receiver_i::Receiver_i (void)
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
index 398955cca27..8f426fb3106 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MT_BIDIR_RECEIVER_I_H
#define MT_BIDIR_RECEIVER_I_H
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
index 9aa036f3327..b3927c57c9b 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver.idl"
interface Sender
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
index d095f295801..c2919011234 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "Sender_i.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
index 107fea38768..b953ff22e91 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
index 3191d2be3e5..d457ba444ad 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
index 0b7c505dec5..2f05d6995eb 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 4d588fdfd60..3934b8461a8 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "status_i.h"
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 853351b58cd..1f709d09964 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STATUS_I_H
#define STATUS_I_H
diff --git a/TAO/performance-tests/Callback/callback.idl b/TAO/performance-tests/Callback/callback.idl
index 690687b4287..ff21fd84f47 100644
--- a/TAO/performance-tests/Callback/callback.idl
+++ b/TAO/performance-tests/Callback/callback.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A module to keep the namespace clean
module Test {
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
index c15ab375bb7..f81d6368ae5 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
index f95fe94f589..a99a293f1fb 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Test.idl b/TAO/performance-tests/Latency/AMH_Single_Threaded/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Test.idl
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index 921205fc58e..981b3480ff6 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip_Handler.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 3ea05031cd0..2431feb42a7 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
Server_Task::Server_Task (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.h b/TAO/performance-tests/Latency/AMI/Server_Task.h
index dcb06d9030c..cfc9d76bc37 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.h
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SERVER_TASK_H
#define SERVER_TASK_H
diff --git a/TAO/performance-tests/Latency/AMI/Test.idl b/TAO/performance-tests/Latency/AMI/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/AMI/Test.idl
+++ b/TAO/performance-tests/Latency/AMI/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index 2834e419b7f..0667989e650 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/Stats.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h
index 5fe9038a703..ab015903554 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 25ce659a86d..47278cd07e3 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 7c7d790e55d..006a4de5723 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "Roundtrip.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.h b/TAO/performance-tests/Latency/Collocation/Server_Task.h
index f9f8a13cf28..0fa23d8b529 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.h
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_SERVER_TASK_H
#define COLLOCATED_SERVER_TASK_H
diff --git a/TAO/performance-tests/Latency/Collocation/Test.idl b/TAO/performance-tests/Latency/Collocation/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/Collocation/Test.idl
+++ b/TAO/performance-tests/Latency/Collocation/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/DII/Test.idl b/TAO/performance-tests/Latency/DII/Test.idl
index c41a5194042..ec48c8b6821 100644
--- a/TAO/performance-tests/Latency/DII/Test.idl
+++ b/TAO/performance-tests/Latency/DII/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index e060033231b..b0564128b93 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
#include "tao/AnyTypeCode/NVList.h"
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h
index e163508f1eb..9086a657385 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/DSI/Test.idl b/TAO/performance-tests/Latency/DSI/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/DSI/Test.idl
+++ b/TAO/performance-tests/Latency/DSI/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/Deferred/Test.idl b/TAO/performance-tests/Latency/Deferred/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/Deferred/Test.idl
+++ b/TAO/performance-tests/Latency/Deferred/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Test.idl b/TAO/performance-tests/Latency/Single_Threaded/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Test.idl
+++ b/TAO/performance-tests/Latency/Single_Threaded/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index 0ec8ce27f22..b3168d869ec 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Test.idl b/TAO/performance-tests/Latency/Thread_Per_Connection/Test.idl
index c41a5194042..ec48c8b6821 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Test.idl
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index 0ec8ce27f22..b3168d869ec 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index c2d9bae5a2c..8ff0316770f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 5631b6e86d7..25b26d1f4cd 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Test.idl b/TAO/performance-tests/Latency/Thread_Pool/Test.idl
index 3f26904a3f0..e56a95cd949 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Test.idl
+++ b/TAO/performance-tests/Latency/Thread_Pool/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index c1359a0c327..38ef68443e6 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Worker_Thread.h"
Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
index ca7109a320d..394be338714 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef WORKER_THREAD_H
#define WORKER_THREAD_H
diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.h b/TAO/performance-tests/Memory/IORsize/Foo_i.h
index 7640b9d7579..007c7f38043 100644
--- a/TAO/performance-tests/Memory/IORsize/Foo_i.h
+++ b/TAO/performance-tests/Memory/IORsize/Foo_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef FOO_I_H
#define FOO_I_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index 3ba056d12f1..9f69bbb5bea 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Memory_Growth.h"
#include "ace/Manual_Event.h"
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index 29557d2a985..7c1868c2027 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Memory_Growth.h"
Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 1901ef7787e..5da0a251fe1 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MEMORY_GROWTH_H
#define MEMORY_GROWTH_H
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Test.idl b/TAO/performance-tests/Memory/Single_Threaded/Test.idl
index 20a5d04a06f..09f33ea0537 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Test.idl
+++ b/TAO/performance-tests/Memory/Single_Threaded/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 90025458295..079be5674be 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 7f87cb0c033..73624c14b7e 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef FACTORY_H
#define FACTORY_H
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index e8ab6662579..e3b8caf8e37 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Simple.h"
Simple::Simple (void)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index ef182bae2f4..3279cb2ae10 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SIMPLE_H
#define SIMPLE_H
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Test.idl b/TAO/performance-tests/POA/Implicit_Activation/Test.idl
index f925e18a804..183355a8739 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Test.idl
+++ b/TAO/performance-tests/POA/Implicit_Activation/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test.idl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test.idl
index 5f1fb02aaa8..4c9e528aad4 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test.idl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test.idl b/TAO/performance-tests/RTCorba/Oneways/Reliable/test.idl
index 4519e9cc9a5..03fd345fa7e 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test.idl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/test.idl b/TAO/performance-tests/RTCorba/Thread_Pool/test.idl
index 04b927d2ca0..8c66d9652cd 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/test.idl
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
index 914a99eaf30..ed762fb28c6 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index 00215bbed1e..e2b64b3ddc1 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 2183a09289f..9866ceb0226 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index 6524b2b3399..7c2cf869732 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index ece701dbf73..ae2ce1f7833 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip_Handler.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 3ea05031cd0..2431feb42a7 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
Server_Task::Server_Task (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
index dcb06d9030c..cfc9d76bc37 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SERVER_TASK_H
#define SERVER_TASK_H
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Test.idl b/TAO/performance-tests/Sequence_Latency/AMI/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 2183a09289f..9866ceb0226 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index 6524b2b3399..7c2cf869732 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Test.idl b/TAO/performance-tests/Sequence_Latency/DII/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/DII/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
index 044389579ff..a6c32d05e50 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestC.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
index e163508f1eb..9086a657385 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Test.idl b/TAO/performance-tests/Sequence_Latency/DSI/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index bb900e4943f..a399d56df78 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 2183a09289f..9866ceb0226 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index 6524b2b3399..7c2cf869732 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl b/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 2183a09289f..9866ceb0226 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index 6524b2b3399..7c2cf869732 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index 5cdf27f0363..d39fd5283a9 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index 4b18192938b..36cf829597b 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index bc9544cbff5..fe58d00e939 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl
index efe330265e3..e721f48860f 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index ad92258caeb..66b9d153715 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index 4b18192938b..36cf829597b 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Roundtrip.h"
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index bc9544cbff5..fe58d00e939 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl
index 8589f1e7a79..6c2a1a33df0 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index c1359a0c327..38ef68443e6 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Worker_Thread.h"
Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
index 7168f88602b..8c7084b5d82 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef WORKER_THREAD_H
#define WORKER_THREAD_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index b44420fd22c..3398bfef863 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index 10b4b65544b..d7159953a82 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef THROUGHPUT_RECEIVER_H
#define THROUGHPUT_RECEIVER_H
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index ed04a345a99..989dd7d6779 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver_Factory.h"
#include "Receiver.h"
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 4ccf75b421b..44a023b49e0 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef THROUGHPUT_RECEIVER_FACTORY_H
#define THROUGHPUT_RECEIVER_FACTORY_H
diff --git a/TAO/performance-tests/Throughput/Test.idl b/TAO/performance-tests/Throughput/Test.idl
index 08e67ceed46..58432e04903 100644
--- a/TAO/performance-tests/Throughput/Test.idl
+++ b/TAO/performance-tests/Throughput/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tao/Monitor/Monitor_Impl.h b/TAO/tao/Monitor/Monitor_Impl.h
index 993e3b3b421..5984d73a56b 100644
--- a/TAO/tao/Monitor/Monitor_Impl.h
+++ b/TAO/tao/Monitor/Monitor_Impl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_MONITOR_IMPL_H
#define TAO_MONITOR_IMPL_H
diff --git a/TAO/tests/AMH_Exceptions/Test.idl b/TAO/tests/AMH_Exceptions/Test.idl
index 6f4030410f4..9a206f87b2a 100644
--- a/TAO/tests/AMH_Exceptions/Test.idl
+++ b/TAO/tests/AMH_Exceptions/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/tests/AMH_Oneway/Test.idl b/TAO/tests/AMH_Oneway/Test.idl
index ef304de303a..9a463c72060 100644
--- a/TAO/tests/AMH_Oneway/Test.idl
+++ b/TAO/tests/AMH_Oneway/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index 1856c608088..0de4b07c10e 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "AMI_Buffering.h"
AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index a1717c10a71..8717c5b5917 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef AMI_BUFFERING_H
#define AMI_BUFFERING_H
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index 221d36fac3a..8182e47a7b5 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "AMI_Buffering_Admin.h"
AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index e09021b0da2..60f0b40346a 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef AMI_BUFFERING_ADMIN_H
#define AMI_BUFFERING_ADMIN_H
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index 560ac417b3b..48327cc41ca 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/AMI_Buffering/Client_Task.h b/TAO/tests/AMI_Buffering/Client_Task.h
index 31f6e44ee7e..631aae096d2 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.h
+++ b/TAO/tests/AMI_Buffering/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef AMI_BUFFERING_CLIENT_TASK_H
#define AMI_BUFFERING_CLIENT_TASK_H
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index e83851109bc..99cf8d3157b 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Reply_Handler.h"
Reply_Handler::Reply_Handler (void)
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index 66d27640d7c..9260787f71b 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef REPLY_HANDLER_H
#define REPLY_HANDLER_H
diff --git a/TAO/tests/AMI_Buffering/Test.idl b/TAO/tests/AMI_Buffering/Test.idl
index 5c757ea0a1b..16da88d03ad 100644
--- a/TAO/tests/AMI_Buffering/Test.idl
+++ b/TAO/tests/AMI_Buffering/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Any/Indirected/test.idl b/TAO/tests/Any/Indirected/test.idl
index 752426d77e4..71568ab4e8e 100644
--- a/TAO/tests/Any/Indirected/test.idl
+++ b/TAO/tests/Any/Indirected/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Any/Recursive/Test.idl b/TAO/tests/Any/Recursive/Test.idl
index 2b8df00288a..80cb296dd2f 100644
--- a/TAO/tests/Any/Recursive/Test.idl
+++ b/TAO/tests/Any/Recursive/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/OctetSeq.pidl"
#include "tao/StringSeq.pidl"
diff --git a/TAO/tests/BiDirectional/test.idl b/TAO/tests/BiDirectional/test.idl
index 47ede657b9a..e085e2458e0 100644
--- a/TAO/tests/BiDirectional/test.idl
+++ b/TAO/tests/BiDirectional/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test.idl b/TAO/tests/BiDirectional_DelayedUpcall/test.idl
index 47ede657b9a..e085e2458e0 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test.idl
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test.idl b/TAO/tests/BiDirectional_NestedUpcall/test.idl
index 47ede657b9a..e085e2458e0 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test.idl
+++ b/TAO/tests/BiDirectional_NestedUpcall/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 7447f0b25a5..3947b758e4c 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Coordinator.h"
Coordinator::Coordinator (CORBA::ULong peer_count)
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 1f1c19bf448..04c4f1fbd32 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_COORDINATOR_H
#define BIG_ONEWAYS_COORDINATOR_H
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index b5bdeb94a7b..64b68b46bab 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Peer.h"
#include "Session.h"
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index c1c2777cbc4..9188396fcce 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_PEER_H
#define BIG_ONEWAYS_PEER_H
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index b4780b4bd54..5d22fa39b08 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 0ed54fbf36b..cacbbd889db 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session_Control.h"
Session_Control::Session_Control (CORBA::ULong session_count)
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 96a6d734e72..edb4799cc78 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_SESSION_CONTROL_H
#define BIG_ONEWAYS_SESSION_CONTROL_H
diff --git a/TAO/tests/Big_Oneways/Session_Task.cpp b/TAO/tests/Big_Oneways/Session_Task.cpp
index 8c4a1efcb43..d457a3b146a 100644
--- a/TAO/tests/Big_Oneways/Session_Task.cpp
+++ b/TAO/tests/Big_Oneways/Session_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session_Task.h"
#include "Session.h"
diff --git a/TAO/tests/Big_Oneways/Session_Task.h b/TAO/tests/Big_Oneways/Session_Task.h
index 6f73ee069b0..a2b151ece63 100644
--- a/TAO/tests/Big_Oneways/Session_Task.h
+++ b/TAO/tests/Big_Oneways/Session_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_SESSION_TASK_H
#define BIG_ONEWAYS_SESSION_TASK_H
diff --git a/TAO/tests/Big_Oneways/Test.idl b/TAO/tests/Big_Oneways/Test.idl
index 60065cf85fc..165def1a823 100644
--- a/TAO/tests/Big_Oneways/Test.idl
+++ b/TAO/tests/Big_Oneways/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index db9fda0680e..36a76b6f73b 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Big_Reply/Client_Task.h b/TAO/tests/Big_Reply/Client_Task.h
index a619e7b8d5f..993a98cc4b9 100644
--- a/TAO/tests/Big_Reply/Client_Task.h
+++ b/TAO/tests/Big_Reply/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_REPLY_CLIENT_TASK_H
#define BIG_REPLY_CLIENT_TASK_H
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index b1ace35723d..2dee638293e 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 6a7c01005dd..4bd2b296eef 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_REQUEST_MUXING_CLIENT_TASK_H
#define BIG_REQUEST_MUXING_CLIENT_TASK_H
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index 8b1de41178d..b55f11f3bfc 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Payload_Receiver.h"
Payload_Receiver::Payload_Receiver (void)
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index c6d8b3a0769..de55d042079 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H
#define BIG_REQUEST_MUXING_PAYLOAD_RECEIVER_H
diff --git a/TAO/tests/Big_Request_Muxing/Test.idl b/TAO/tests/Big_Request_Muxing/Test.idl
index 9c87be06508..f2280e521c7 100644
--- a/TAO/tests/Big_Request_Muxing/Test.idl
+++ b/TAO/tests/Big_Request_Muxing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 2d258c15f71..e00cf0ba178 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Coordinator.h"
Coordinator::Coordinator (CORBA::ULong peer_count)
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 9d8ae0fbd92..82b169f6b7e 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_COORDINATOR_H
#define BIG_ONEWAYS_COORDINATOR_H
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index d866b0dd7dc..33fe93ec561 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Peer.h"
#include "Session.h"
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index c1c2777cbc4..9188396fcce 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_PEER_H
#define BIG_ONEWAYS_PEER_H
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 691d792eb70..3e0e27a2a68 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 0f47ee16245..5fcd3cfe35f 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session_Control.h"
Session_Control::Session_Control (CORBA::ULong session_count)
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 96a6d734e72..edb4799cc78 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_SESSION_CONTROL_H
#define BIG_ONEWAYS_SESSION_CONTROL_H
diff --git a/TAO/tests/Big_Twoways/Session_Task.cpp b/TAO/tests/Big_Twoways/Session_Task.cpp
index 8c4a1efcb43..d457a3b146a 100644
--- a/TAO/tests/Big_Twoways/Session_Task.cpp
+++ b/TAO/tests/Big_Twoways/Session_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Session_Task.h"
#include "Session.h"
diff --git a/TAO/tests/Big_Twoways/Session_Task.h b/TAO/tests/Big_Twoways/Session_Task.h
index 6f73ee069b0..a2b151ece63 100644
--- a/TAO/tests/Big_Twoways/Session_Task.h
+++ b/TAO/tests/Big_Twoways/Session_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BIG_ONEWAYS_SESSION_TASK_H
#define BIG_ONEWAYS_SESSION_TASK_H
diff --git a/TAO/tests/Big_Twoways/Test.idl b/TAO/tests/Big_Twoways/Test.idl
index 04255aa1262..d13f9878e6e 100644
--- a/TAO/tests/Big_Twoways/Test.idl
+++ b/TAO/tests/Big_Twoways/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index bd0704de43f..c6c31ef56c4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Blocking_Sync_None.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 9a6f109ae8a..76044d36263 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BLOCKING_SYNC_NONE_H
#define BLOCKING_SYNC_NONE_H
diff --git a/TAO/tests/Blocking_Sync_None/Test.idl b/TAO/tests/Blocking_Sync_None/Test.idl
index 46596465827..dce16c37768 100644
--- a/TAO/tests/Blocking_Sync_None/Test.idl
+++ b/TAO/tests/Blocking_Sync_None/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
index d7dd17a1a17..80a2c49f14a 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BUG_1020_BASIC_REGRESSION_CLIENT_TASK_H
#define BUG_1020_BASIC_REGRESSION_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.h b/TAO/tests/Bug_1020_Regression/Server_Task.h
index 04dcdbbc98e..fbd0c089642 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef Server_Task__h_
#define Server_Task__h_
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index c2c1d06aea0..6c1c7f310ba 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "BlobServer.h"
BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index 01e568a32c5..3875b04a7f4 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef BLOBSERVER_H
#define BLOBSERVER_H
diff --git a/TAO/tests/Bug_1330_Regression/Test.idl b/TAO/tests/Bug_1330_Regression/Test.idl
index c4d2bf46647..a7d7981e0a1 100644
--- a/TAO/tests/Bug_1330_Regression/Test.idl
+++ b/TAO/tests/Bug_1330_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp
index ef2e83a8dcd..2493d0ae37d 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
Test_i::Test_i(CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index 5c5077d8532..0ae7dfeface 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// -*- C++ -*-
#if !defined BUG_1330_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp
index 143323b25ef..6a9214cc9f0 100644
--- a/TAO/tests/Bug_1330_Regression/client.cpp
+++ b/TAO/tests/Bug_1330_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index e76e80c4759..e27dc78b513 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Test_i.h"
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index 48e0f8666bf..1a9e42386d4 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.h b/TAO/tests/Bug_1476_Regression/Client_Task.h
index f4418a27bc9..7e31b950196 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAYS_INVOKING_TWOWAYS_CLIENT_TASK_H
#define ONEWAYS_INVOKING_TWOWAYS_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
index 3b8532d941d..d5da80805a5 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.h b/TAO/tests/Bug_1476_Regression/Server_Task.h
index a6ecae2217a..b00eef99fbf 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAYS_INVOKING_TWOWAYS_SERVER_TASK_H
#define ONEWAYS_INVOKING_TWOWAYS_SERVER_TASK_H
diff --git a/TAO/tests/Bug_1476_Regression/Test.idl b/TAO/tests/Bug_1476_Regression/Test.idl
index 6d19ca24a74..7f5cc236585 100644
--- a/TAO/tests/Bug_1476_Regression/Test.idl
+++ b/TAO/tests/Bug_1476_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Bug_1476_Test/Hello.idl b/TAO/tests/Bug_1476_Test/Hello.idl
index 34637c5870e..8168f7755a0 100644
--- a/TAO/tests/Bug_1476_Test/Hello.idl
+++ b/TAO/tests/Bug_1476_Test/Hello.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index 123a01f9dbb..ccb8dd6b03b 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "tao/Stub.h"
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.h b/TAO/tests/Bug_1482_Regression/Client_Task.h
index c91b880a5a4..69e937d7249 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LONGUPCALLS_CLIENT_TASK_H
#define LONGUPCALLS_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index 2d3482160b2..33e7e166cef 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "ace/ACE.h"
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 96c88856c65..1f9423f17c0 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
index 9447621cd73..502da807fc9 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
Server_Task::Server_Task (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.h b/TAO/tests/Bug_1482_Regression/Server_Task.h
index 3df83651af5..a07f998f5a1 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LONGUPCALLS_SERVER_TASK_H
#define LONGUPCALLS_SERVER_TASK_H
diff --git a/TAO/tests/Bug_1482_Regression/Test.idl b/TAO/tests/Bug_1482_Regression/Test.idl
index 22d8aee58d9..a430f7cb1bb 100644
--- a/TAO/tests/Bug_1482_Regression/Test.idl
+++ b/TAO/tests/Bug_1482_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index fc0a4beaa9b..16ea068aeca 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "interceptors.h"
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index c49d26cc388..fa95c4361e6 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Server_ORBInitializer.h"
#include "server_interceptor.h"
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index 0f7194fa847..2272771c5de 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp
index 8ecec19473b..c99cfe0aaec 100644
--- a/TAO/tests/Bug_1535_Regression/Test.cpp
+++ b/TAO/tests/Bug_1535_Regression/Test.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test.h"
Hello::Hello (PortableServer::POA_ptr poa) :
diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h
index df13c104c11..9e987171955 100644
--- a/TAO/tests/Bug_1535_Regression/Test.h
+++ b/TAO/tests/Bug_1535_Regression/Test.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.h b/TAO/tests/Bug_1551_Regression/Client_Task.h
index 1027324cfce..4a942cc92b9 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 01fa3c62a42..20e535f3c6d 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 4617c5ea5c5..9b27bd8f04e 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef REPLY_HANDLER_H
#define REPLY_HANDLER_H
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
index 246a93ce865..75038ceb12a 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
Server_Task::Server_Task (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.h b/TAO/tests/Bug_1551_Regression/Server_Task.h
index 2dc1e89d2cd..a35c3689b07 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SERVER_TASK_H
#define SERVER_TASK_H
diff --git a/TAO/tests/Bug_1551_Regression/Test.idl b/TAO/tests/Bug_1551_Regression/Test.idl
index 7b4c95844bd..720bd64e5e7 100644
--- a/TAO/tests/Bug_1551_Regression/Test.idl
+++ b/TAO/tests/Bug_1551_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index 5e45e51c4aa..e7d57191914 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestS.h"
#include "Client_Task.h"
diff --git a/TAO/tests/Bug_1627_Regression/Test.idl b/TAO/tests/Bug_1627_Regression/Test.idl
index 6844131c75f..119285ae59f 100644
--- a/TAO/tests/Bug_1627_Regression/Test.idl
+++ b/TAO/tests/Bug_1627_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
void test_method();
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp
index ff714f3bbd6..ef59e84556d 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
Test_i::Test_i()
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h
index 94bf9373017..80649bd8994 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.h
+++ b/TAO/tests/Bug_1627_Regression/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// -*- C++ -*-
#if !defined BUG_1330_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp
index 4a0ab7db26d..06d1e6e6dd0 100644
--- a/TAO/tests/Bug_1627_Regression/client.cpp
+++ b/TAO/tests/Bug_1627_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index 08715c08c59..9e102561cd5 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Test_i.h"
diff --git a/TAO/tests/Bug_1628_Regression/TestCase.idl b/TAO/tests/Bug_1628_Regression/TestCase.idl
index 1e95c85d444..f67757e1627 100644
--- a/TAO/tests/Bug_1628_Regression/TestCase.idl
+++ b/TAO/tests/Bug_1628_Regression/TestCase.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestType.idl"
diff --git a/TAO/tests/Bug_1628_Regression/TestType.idl b/TAO/tests/Bug_1628_Regression/TestType.idl
index a7f1adde7b2..8fe28c8d85e 100644
--- a/TAO/tests/Bug_1628_Regression/TestType.idl
+++ b/TAO/tests/Bug_1628_Regression/TestType.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
//module Test {
diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index aac3e960c89..38469ec3c1f 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/ORB.h"
int
diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp
index 631dd3c1a65..597f70f1cac 100644
--- a/TAO/tests/Bug_1636_Regression/client.cpp
+++ b/TAO/tests/Bug_1636_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_1636_Regression/test.idl b/TAO/tests/Bug_1636_Regression/test.idl
index bcc36ac8d64..b8ff5eee421 100644
--- a/TAO/tests/Bug_1636_Regression/test.idl
+++ b/TAO/tests/Bug_1636_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module UnionIecs
{
enum E_type_num
diff --git a/TAO/tests/Bug_1639_Regression/struct.idl b/TAO/tests/Bug_1639_Regression/struct.idl
index ab7ae27e229..c3b56ea73a3 100644
--- a/TAO/tests/Bug_1639_Regression/struct.idl
+++ b/TAO/tests/Bug_1639_Regression/struct.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module StructTest {
struct MyStruct {
diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp
index 3ae94e6ea10..9e29e5fb013 100644
--- a/TAO/tests/Bug_1639_Regression/struct_client.cpp
+++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "structC.h"
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index c0f0a801fd8..cdc0726f92b 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h
index b7e293a5fe2..53449753f89 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.h
+++ b/TAO/tests/Bug_1676_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 8eaf4fdd0a6..0d9904744fc 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index 518367b85cd..17818af0c26 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "EventNode.h"
#include "tid_to_int.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index b2bb74f28de..768200dd39e 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef EVENT_NODE_H
#define EVENT_NODE_H
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index c88af27ed68..cf2be3df7bc 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tid_to_int.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 6a101baded5..f7d4bc3b661 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index dbb6065029b..714d91a81e1 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "EventNode.h"
diff --git a/TAO/tests/Bug_2084_Regression/Test.idl b/TAO/tests/Bug_2084_Regression/Test.idl
index c7b2b200b52..282c1fca6d9 100644
--- a/TAO/tests/Bug_2084_Regression/Test.idl
+++ b/TAO/tests/Bug_2084_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2144_Regression/test.idl b/TAO/tests/Bug_2144_Regression/test.idl
index 28335e7e932..9513a089c7f 100644
--- a/TAO/tests/Bug_2144_Regression/test.idl
+++ b/TAO/tests/Bug_2144_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
enum Selector { STRUCTTYPE, VALTYPE };
diff --git a/TAO/tests/Bug_2174_Regression/test.idl b/TAO/tests/Bug_2174_Regression/test.idl
index 946bd383938..e551cc85067 100644
--- a/TAO/tests/Bug_2174_Regression/test.idl
+++ b/TAO/tests/Bug_2174_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server {
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index c3338228150..9806cdd133d 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2183_Regression/Test.idl b/TAO/tests/Bug_2183_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_2183_Regression/Test.idl
+++ b/TAO/tests/Bug_2183_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index 0335cf3e142..0eed190c1f6 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index e2799f520b1..46d192e5166 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2186_Regression/Test.idl b/TAO/tests/Bug_2186_Regression/Test.idl
index c1a23e8d785..5484dc0ae13 100644
--- a/TAO/tests/Bug_2186_Regression/Test.idl
+++ b/TAO/tests/Bug_2186_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2188_Regression/broken.idl b/TAO/tests/Bug_2188_Regression/broken.idl
index f9281226e31..426ea32703e 100644
--- a/TAO/tests/Bug_2188_Regression/broken.idl
+++ b/TAO/tests/Bug_2188_Regression/broken.idl
@@ -1,8 +1,5 @@
//
// broken.idl -- Test IDL for array type CCA regressions
-//
-// $Id$
-//
enum enum1
{
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
index be6cb775131..ef58f4548f7 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.h b/TAO/tests/Bug_2241_Regression/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Bug_2241_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2241_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp
index fa28f2a6135..05ff299503e 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2241_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.h
+++ b/TAO/tests/Bug_2241_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2241_Regression/Server_Task.cpp b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Bug_2241_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2241_Regression/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Bug_2241_Regression/Test.idl b/TAO/tests/Bug_2241_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_2241_Regression/Test.idl
+++ b/TAO/tests/Bug_2241_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
index 26e65b4f03d..91123d63a20 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "MyInterfaceImpl.h"
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
index bdfc6ce9f6d..1dec14ed0bc 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestS.h"
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp
index 91e62e7e286..bd921ac2c4b 100644
--- a/TAO/tests/Bug_2289_Regression/client.cpp
+++ b/TAO/tests/Bug_2289_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestS.h"
#include "MyInterfaceImpl.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index dd4739827b9..8ab85f8964d 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "MyInterfaceImpl.h"
#include "TestS.h"
diff --git a/TAO/tests/Bug_2319_Regression/Test.idl b/TAO/tests/Bug_2319_Regression/Test.idl
index ef304de303a..9a463c72060 100644
--- a/TAO/tests/Bug_2319_Regression/Test.idl
+++ b/TAO/tests/Bug_2319_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
index f506069d9db..116df3251b6 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2328_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 421ccc5e2bd..14f9189feb0 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2328_Regression/Test.idl b/TAO/tests/Bug_2328_Regression/Test.idl
index 528f0c5485c..94b2900a1ad 100644
--- a/TAO/tests/Bug_2328_Regression/Test.idl
+++ b/TAO/tests/Bug_2328_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2494_Regression/test.idl b/TAO/tests/Bug_2494_Regression/test.idl
index 335009e627f..14f5f53da8b 100644
--- a/TAO/tests/Bug_2494_Regression/test.idl
+++ b/TAO/tests/Bug_2494_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/tests/Bug_2560_Regression/Quoter.idl b/TAO/tests/Bug_2560_Regression/Quoter.idl
index df64c3ede73..755b72240ad 100644
--- a/TAO/tests/Bug_2560_Regression/Quoter.idl
+++ b/TAO/tests/Bug_2560_Regression/Quoter.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Quoter
{
diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
index 9dd3ffa587d..2b77ffc5c17 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.h b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.h
index fe306085436..9c16277c940 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.h
+++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
index 07b39acc534..dd3e473e8f8 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2560_Regression/Stock_i.h b/TAO/tests/Bug_2560_Regression/Stock_i.h
index bab95d96744..15088b20536 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_i.h
+++ b/TAO/tests/Bug_2560_Regression/Stock_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
#define TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_I_H
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 3f337d4ec88..183a0b9f114 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
// Include the generated names....
#include "QuoterC.h"
diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index 4a9607312bc..83c7f8c47a0 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Stock_Factory_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2593_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2593_Regression/Test.idl b/TAO/tests/Bug_2593_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_2593_Regression/Test.idl
+++ b/TAO/tests/Bug_2593_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index df2a18536d2..efa87b0a8e4 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index ffee7b8e0f8..d5db75e3c6a 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2683_Regression/Test.idl b/TAO/tests/Bug_2683_Regression/Test.idl
index 0adcaba0a70..04baffe4628 100644
--- a/TAO/tests/Bug_2683_Regression/Test.idl
+++ b/TAO/tests/Bug_2683_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index c5fad9a50c5..879bf15ecd3 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index c749c436001..154e49b5a11 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Bug_2702_Regression/Test.idl b/TAO/tests/Bug_2702_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_2702_Regression/Test.idl
+++ b/TAO/tests/Bug_2702_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2734_Regression/test.idl b/TAO/tests/Bug_2734_Regression/test.idl
index 5481e3f26f0..aee6a39899c 100644
--- a/TAO/tests/Bug_2734_Regression/test.idl
+++ b/TAO/tests/Bug_2734_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server {
diff --git a/TAO/tests/Bug_2768_Regression/Messenger.idl b/TAO/tests/Bug_2768_Regression/Messenger.idl
index c8a0bdedeea..6ccd2e82f60 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger.idl
+++ b/TAO/tests/Bug_2768_Regression/Messenger.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module SimpleMessenger
{
diff --git a/TAO/tests/Bug_2804_Regression/Test.idl b/TAO/tests/Bug_2804_Regression/Test.idl
index 91f18412c07..5189da4c628 100644
--- a/TAO/tests/Bug_2804_Regression/Test.idl
+++ b/TAO/tests/Bug_2804_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/OctetSeq.pidl"
diff --git a/TAO/tests/Bug_2844_Regression/Test.idl b/TAO/tests/Bug_2844_Regression/Test.idl
index 3fbfd427ac1..a7fa1d8a52f 100644
--- a/TAO/tests/Bug_2844_Regression/Test.idl
+++ b/TAO/tests/Bug_2844_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/OctetSeq.pidl"
#include "tao/StringSeq.pidl"
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.cpp b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
index 560ac417b3b..48327cc41ca 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.h b/TAO/tests/Bug_2953_Regression/Client_Task.h
index 31f6e44ee7e..631aae096d2 100644
--- a/TAO/tests/Bug_2953_Regression/Client_Task.h
+++ b/TAO/tests/Bug_2953_Regression/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef AMI_BUFFERING_CLIENT_TASK_H
#define AMI_BUFFERING_CLIENT_TASK_H
diff --git a/TAO/tests/Bug_2953_Regression/Test.idl b/TAO/tests/Bug_2953_Regression/Test.idl
index 8aebdf54943..72b003e0945 100644
--- a/TAO/tests/Bug_2953_Regression/Test.idl
+++ b/TAO/tests/Bug_2953_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.h
+++ b/TAO/tests/Bug_2966_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_2966_Regression/Test.idl b/TAO/tests/Bug_2966_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_2966_Regression/Test.idl
+++ b/TAO/tests/Bug_2966_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3000_Regression/Callback.cpp b/TAO/tests/Bug_3000_Regression/Callback.cpp
index aea07d5c0da..fbf466a8735 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.cpp
+++ b/TAO/tests/Bug_3000_Regression/Callback.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Callback.h"
Callback::Callback (void)
diff --git a/TAO/tests/Bug_3000_Regression/Callback.h b/TAO/tests/Bug_3000_Regression/Callback.h
index 7d0e5c44744..e667bd5f4ff 100644
--- a/TAO/tests/Bug_3000_Regression/Callback.h
+++ b/TAO/tests/Bug_3000_Regression/Callback.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CALLBACK_CALLBACK_H
#define CALLBACK_CALLBACK_H
diff --git a/TAO/tests/Bug_3000_Regression/Service.cpp b/TAO/tests/Bug_3000_Regression/Service.cpp
index c9c3e0241dc..6c17ca72986 100644
--- a/TAO/tests/Bug_3000_Regression/Service.cpp
+++ b/TAO/tests/Bug_3000_Regression/Service.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Service.h"
Service::Service (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3000_Regression/Service.h b/TAO/tests/Bug_3000_Regression/Service.h
index afd4645f0e4..c34f4c98f46 100644
--- a/TAO/tests/Bug_3000_Regression/Service.h
+++ b/TAO/tests/Bug_3000_Regression/Service.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CALLBACK_SERVICE_H
#define CALLBACK_SERVICE_H
diff --git a/TAO/tests/Bug_3000_Regression/Test.idl b/TAO/tests/Bug_3000_Regression/Test.idl
index 5088a328264..e903027864c 100644
--- a/TAO/tests/Bug_3000_Regression/Test.idl
+++ b/TAO/tests/Bug_3000_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Bug_3068_Regression/test.idl b/TAO/tests/Bug_3068_Regression/test.idl
index 4abdca2c791..70b024cce13 100644
--- a/TAO/tests/Bug_3068_Regression/test.idl
+++ b/TAO/tests/Bug_3068_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/OctetSeq.pidl"
diff --git a/TAO/tests/Bug_3163_Regression/test.idl b/TAO/tests/Bug_3163_Regression/test.idl
index 61fad5e0cce..1840f6b9f32 100644
--- a/TAO/tests/Bug_3163_Regression/test.idl
+++ b/TAO/tests/Bug_3163_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/CharSeq.pidl"
interface ctest {
diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.h
+++ b/TAO/tests/Bug_3299_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3299_Regression/Test.idl b/TAO/tests/Bug_3299_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3299_Regression/Test.idl
+++ b/TAO/tests/Bug_3299_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3333_Regression/Hello.cpp b/TAO/tests/Bug_3333_Regression/Hello.cpp
index 41a73fd5427..16f276e957c 100644
--- a/TAO/tests/Bug_3333_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3333_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3333_Regression/Hello.h b/TAO/tests/Bug_3333_Regression/Hello.h
index af231fe1540..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3333_Regression/Hello.h
+++ b/TAO/tests/Bug_3333_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3333_Regression/Test.idl b/TAO/tests/Bug_3333_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3333_Regression/Test.idl
+++ b/TAO/tests/Bug_3333_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp
index b9f417703c9..d37f0772af4 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3430_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h
index dadef8e03c6..e7318b30deb 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.h
+++ b/TAO/tests/Bug_3430_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3430_Regression/Test.idl b/TAO/tests/Bug_3430_Regression/Test.idl
index d68c0519a94..d25bdadb243 100644
--- a/TAO/tests/Bug_3430_Regression/Test.idl
+++ b/TAO/tests/Bug_3430_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3471_Regression/Hello.cpp b/TAO/tests/Bug_3471_Regression/Hello.cpp
index 6426b2f3d4e..8784e87fb10 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3471_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3471_Regression/Hello.h b/TAO/tests/Bug_3471_Regression/Hello.h
index 2b8193b5c3d..5235bc0fe8f 100644
--- a/TAO/tests/Bug_3471_Regression/Hello.h
+++ b/TAO/tests/Bug_3471_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3471_Regression/Test.idl b/TAO/tests/Bug_3471_Regression/Test.idl
index c66c89247e9..1da19b5efc5 100644
--- a/TAO/tests/Bug_3471_Regression/Test.idl
+++ b/TAO/tests/Bug_3471_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp
index 88ef46a2a51..9eb011eec14 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3479_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h
index be97f9b6c82..bdce42f931d 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.h
+++ b/TAO/tests/Bug_3479_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3479_Regression/Test.idl b/TAO/tests/Bug_3479_Regression/Test.idl
index a775b5e554d..4aaa9b4db9d 100644
--- a/TAO/tests/Bug_3479_Regression/Test.idl
+++ b/TAO/tests/Bug_3479_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3531_Regression/test.idl b/TAO/tests/Bug_3531_Regression/test.idl
index 447917cbda9..cb07d44e462 100644
--- a/TAO/tests/Bug_3531_Regression/test.idl
+++ b/TAO/tests/Bug_3531_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/tests/Bug_3552_Regression/struct.idl b/TAO/tests/Bug_3552_Regression/struct.idl
index 232f13b1b8a..742cd317947 100644
--- a/TAO/tests/Bug_3552_Regression/struct.idl
+++ b/TAO/tests/Bug_3552_Regression/struct.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3553_Regression/Hello.cpp b/TAO/tests/Bug_3553_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3553_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.h
+++ b/TAO/tests/Bug_3553_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3553_Regression/Test.idl b/TAO/tests/Bug_3553_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3553_Regression/Test.idl
+++ b/TAO/tests/Bug_3553_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3558_Regression/Hello.cpp b/TAO/tests/Bug_3558_Regression/Hello.cpp
index 54b23b5d560..c95b536fb39 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3558_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.h
+++ b/TAO/tests/Bug_3558_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3558_Regression/Test.idl b/TAO/tests/Bug_3558_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3558_Regression/Test.idl
+++ b/TAO/tests/Bug_3558_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.cpp b/TAO/tests/Bug_3598a_Regression/Hello.cpp
index 4c72b17a7c6..2e31783440f 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3598a_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.h b/TAO/tests/Bug_3598a_Regression/Hello.h
index af231fe1540..88fd5ffb5b8 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.h
+++ b/TAO/tests/Bug_3598a_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3598a_Regression/Test.idl b/TAO/tests/Bug_3598a_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3598a_Regression/Test.idl
+++ b/TAO/tests/Bug_3598a_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3636_Regression/Hello.cpp b/TAO/tests/Bug_3636_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3636_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.h
+++ b/TAO/tests/Bug_3636_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3636_Regression/Test.idl b/TAO/tests/Bug_3636_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3636_Regression/Test.idl
+++ b/TAO/tests/Bug_3636_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
index 6a8b08b9f61..efd8569082e 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h
@@ -1,8 +1,5 @@
#ifndef Bug_3647_Regression_Backend_Impl_h
#define Bug_3647_Regression_Backend_Impl_h
-//
-// $Id$
-//
#include "TestS.h"
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
index ef57ed5a1a6..0435f8a3b7d 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h
@@ -1,8 +1,5 @@
#ifndef Bug_3647_Regression_Middle_Impl_h
#define Bug_3647_Regression_Middle_Impl_h
-//
-// $Id$
-//
#include "TestS.h"
diff --git a/TAO/tests/Bug_3676_Regression/Hello.cpp b/TAO/tests/Bug_3676_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3676_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.h
+++ b/TAO/tests/Bug_3676_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3676_Regression/Test.idl b/TAO/tests/Bug_3676_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3676_Regression/Test.idl
+++ b/TAO/tests/Bug_3676_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3743_Regression/Test.idl b/TAO/tests/Bug_3743_Regression/Test.idl
index 6bf60489dae..1d0894e65ca 100644
--- a/TAO/tests/Bug_3743_Regression/Test.idl
+++ b/TAO/tests/Bug_3743_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include <orb.idl>
diff --git a/TAO/tests/Bug_3746_Regression/Test.idl b/TAO/tests/Bug_3746_Regression/Test.idl
index c566d5e04e0..f7cf6e56990 100644
--- a/TAO/tests/Bug_3746_Regression/Test.idl
+++ b/TAO/tests/Bug_3746_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp
index 35280a77139..d7b45432f6a 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
BoundSequences::BoundSequences (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 454a4e75c3e..370f09f3aba 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3748_Regression/Hello.cpp b/TAO/tests/Bug_3748_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3748_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.h
+++ b/TAO/tests/Bug_3748_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
index 78f25fc1357..4242dc7a94c 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Server_ORBInitializer.h"
#include "Test_Protocols_Hooks.h"
diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
index 6bffdffaf04..9554057647d 100644
--- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_3748_Regression/Test.idl b/TAO/tests/Bug_3748_Regression/Test.idl
index 41f10f04d02..f96517d3eb8 100644
--- a/TAO/tests/Bug_3748_Regression/Test.idl
+++ b/TAO/tests/Bug_3748_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
index 61a1e53f32d..4782e4214e5 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Test_Protocols_Hooks.h"
#include "TestC.h"
diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
index e3f4ff62c3c..e2adfb45ba3 100644
--- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
+++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TEST_PROTOCOLS_HOOKS_H
#define TEST_PROTOCOLS_HOOKS_H
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
index a29bc9495f7..1891762834c 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "simple_test_i.h"
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h
index 0a5f17eeeda..9918438def1 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.h
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3837_Regression/Hello.cpp b/TAO/tests/Bug_3837_Regression/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3837_Regression/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.h
+++ b/TAO/tests/Bug_3837_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3837_Regression/Test.idl b/TAO/tests/Bug_3837_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3837_Regression/Test.idl
+++ b/TAO/tests/Bug_3837_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
index 3cc45d0006e..bc637249076 100644
--- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef CLIENT_ORB_INITIALIZER_H
#define CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_3853_Regression/Hello.idl b/TAO/tests/Bug_3853_Regression/Hello.idl
index b707d501a1a..92b66f0f5dc 100644
--- a/TAO/tests/Bug_3853_Regression/Hello.idl
+++ b/TAO/tests/Bug_3853_Regression/Hello.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Demo
{
interface HelloWorld
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h
index 08bb5d8f0d1..f7f361d02f1 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.h
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_I_H
#define HELLO_I_H
diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.h
+++ b/TAO/tests/Bug_3896_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3896_Regression/Test.idl b/TAO/tests/Bug_3896_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3896_Regression/Test.idl
+++ b/TAO/tests/Bug_3896_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_3919_Regression/Test.idl b/TAO/tests/Bug_3919_Regression/Test.idl
index f15c0dd0e0e..df27bea84f6 100644
--- a/TAO/tests/Bug_3919_Regression/Test.idl
+++ b/TAO/tests/Bug_3919_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/OctetSeq.pidl"
#include "tao/StringSeq.pidl"
diff --git a/TAO/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.h
+++ b/TAO/tests/Bug_3954_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_3954_Regression/Test.idl b/TAO/tests/Bug_3954_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_3954_Regression/Test.idl
+++ b/TAO/tests/Bug_3954_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_4010_Regression/Hello.h b/TAO/tests/Bug_4010_Regression/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.h
+++ b/TAO/tests/Bug_4010_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_4010_Regression/Test.idl b/TAO/tests/Bug_4010_Regression/Test.idl
index 385943134bd..b7402dfad58 100644
--- a/TAO/tests/Bug_4010_Regression/Test.idl
+++ b/TAO/tests/Bug_4010_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Bug_4059_Regression/Hello.h b/TAO/tests/Bug_4059_Regression/Hello.h
index f87205c3011..c39a60042d7 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.h
+++ b/TAO/tests/Bug_4059_Regression/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Bug_4059_Regression/Test.idl b/TAO/tests/Bug_4059_Regression/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Bug_4059_Regression/Test.idl
+++ b/TAO/tests/Bug_4059_Regression/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h
index 74dce8b3bc3..1f3fa76b019 100644
--- a/TAO/tests/COIOP/Client_Task.h
+++ b/TAO/tests/COIOP/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/COIOP/Test.idl b/TAO/tests/COIOP/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/COIOP/Test.idl
+++ b/TAO/tests/COIOP/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
index 8f65ca11062..d4c95c9aba1 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (void)
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
index b9a328eeb34..a2a5be4ab2d 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Test.idl b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl
index 57ce97b7e5c..ce456267f49 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/Test.idl
+++ b/TAO/tests/CORBA_e_Implicit_Activation/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index b566ba935ed..02e9b557bb5 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/Transport_Cache_Manager.h"
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Cache_Growth_Test/Test.idl b/TAO/tests/Cache_Growth_Test/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Cache_Growth_Test/Test.idl
+++ b/TAO/tests/Cache_Growth_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp
index 73b3593b606..b12a7b10e8f 100644
--- a/TAO/tests/CallbackTest/Callback.cpp
+++ b/TAO/tests/CallbackTest/Callback.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Callback.h"
Callback::Callback (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h
index 98b92c1bb72..a2ae7b9064b 100644
--- a/TAO/tests/CallbackTest/Callback.h
+++ b/TAO/tests/CallbackTest/Callback.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CALLBACK_CALLBACK_H
#define CALLBACK_CALLBACK_H
diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp
index 307a4a83a80..96a20024185 100644
--- a/TAO/tests/CallbackTest/Service.cpp
+++ b/TAO/tests/CallbackTest/Service.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Service.h"
Service::Service (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h
index b0fe219d517..78a6945d8d2 100644
--- a/TAO/tests/CallbackTest/Service.h
+++ b/TAO/tests/CallbackTest/Service.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CALLBACK_SERVICE_H
#define CALLBACK_SERVICE_H
diff --git a/TAO/tests/CallbackTest/Test.idl b/TAO/tests/CallbackTest/Test.idl
index d10096168e8..4bfa44f23c8 100644
--- a/TAO/tests/CallbackTest/Test.idl
+++ b/TAO/tests/CallbackTest/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/ClientPortSpan/Hello.h b/TAO/tests/ClientPortSpan/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/ClientPortSpan/Hello.h
+++ b/TAO/tests/ClientPortSpan/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/ClientPortSpan/Test.idl b/TAO/tests/ClientPortSpan/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/ClientPortSpan/Test.idl
+++ b/TAO/tests/ClientPortSpan/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index 8bd8670713c..33c6bae4274 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index 12a45e7aac2..fb03f4a5bc7 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_LEAKS_CLIENT_TASK_H
#define CLIENT_LEAKS_CLIENT_TASK_H
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 6bf3cb78eac..c05907a1a3e 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Process.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index 7906a4a0d7d..ff42dd8d9a9 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_LEAKS_PROCESS_H
#define CLIENT_LEAKS_PROCESS_H
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index 708265f5215..da18c6c30ac 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Process_Factory.h"
#include "Startup_Callback.h"
#include "ace/Process.h"
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index 1fc6c346097..f21a360f019 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_LEAKS_PROCESS_FACTORY_H
#define CLIENT_LEAKS_PROCESS_FACTORY_H
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index d37db8a5690..c071110e1fa 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
diff --git a/TAO/tests/Client_Leaks/Server_Task.h b/TAO/tests/Client_Leaks/Server_Task.h
index ecc5a9675f2..8b5f48d872c 100644
--- a/TAO/tests/Client_Leaks/Server_Task.h
+++ b/TAO/tests/Client_Leaks/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_LEAKS_SERVER_TASK_H
#define CLIENT_LEAKS_SERVER_TASK_H
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 15eefd990eb..7056173d188 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Startup_Callback.h"
Startup_Callback::Startup_Callback (void)
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index 9278b235cc2..eae388467ec 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CLIENT_LEAKS_STARTUP_CALLBACK_H
#define CLIENT_LEAKS_STARTUP_CALLBACK_H
diff --git a/TAO/tests/Client_Leaks/Test.idl b/TAO/tests/Client_Leaks/Test.idl
index c7c4ee2abf2..5feb9388272 100644
--- a/TAO/tests/Client_Leaks/Test.idl
+++ b/TAO/tests/Client_Leaks/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
index 8887b3ce577..94c6a6a242a 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
index 6494c809db8..afb3cb8c933 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Test.idl b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Test.idl
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
index 4708f2680d8..990e1564d52 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
index cfa1a886365..8941c49f734 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Test.idl b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Test.idl
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
index bfbe61b4942..998b8a31cb0 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
index fe5d6fec8fa..2188d4d09a6 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Test.idl b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Test.idl
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
index 0ea9453a73d..bbd3d5aa183 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.h b/TAO/tests/Collocated_DerivedIF/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_DerivedIF/Client_Task.h
+++ b/TAO/tests/Collocated_DerivedIF/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h
index 0ee5d3cc2da..4bb8b790558 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.h
+++ b/TAO/tests/Collocated_DerivedIF/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
index 4d1e74d4a9a..6b89058c3ac 100644
--- a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp
index 4708f2680d8..990e1564d52 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_NoColl/Client_Task.h b/TAO/tests/Collocated_NoColl/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_NoColl/Client_Task.h
+++ b/TAO/tests/Collocated_NoColl/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_NoColl/Hello.cpp b/TAO/tests/Collocated_NoColl/Hello.cpp
index cfa1a886365..8941c49f734 100644
--- a/TAO/tests/Collocated_NoColl/Hello.cpp
+++ b/TAO/tests/Collocated_NoColl/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_NoColl/Hello.h
+++ b/TAO/tests/Collocated_NoColl/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_NoColl/Server_Task.cpp b/TAO/tests/Collocated_NoColl/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocated_NoColl/Server_Task.cpp
+++ b/TAO/tests/Collocated_NoColl/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_NoColl/Test.idl b/TAO/tests/Collocated_NoColl/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_NoColl/Test.idl
+++ b/TAO/tests/Collocated_NoColl/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
index 24f82132b28..b5925ed1f44 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
index e77d95e07bc..8613b8172b3 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
index 2cca42206ee..206b5e564a0 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Test.idl b/TAO/tests/Collocated_ThruP_Sp/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Test.idl
+++ b/TAO/tests/Collocated_ThruP_Sp/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
index 24f82132b28..b5925ed1f44 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
index e77d95e07bc..8613b8172b3 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Test.idl b/TAO/tests/Collocated_ThruP_Sp_Gd/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Test.idl
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
index 49606c9134d..52ce918d128 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h
index 7cd0fd1eb01..0e094e55f62 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index 36b16d486c8..4cbd97bc1e0 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index 884af0f60bb..a75d4d64ea2 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocation_Exception_Test/Test.idl b/TAO/tests/Collocation_Exception_Test/Test.idl
index fae0b26f3d2..13b47780efe 100644
--- a/TAO/tests/Collocation_Exception_Test/Test.idl
+++ b/TAO/tests/Collocation_Exception_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 60def11ca92..ecb276fa6cb 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
index 1e8a39a26cf..accef8a3c76 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index 921f90448bc..84b661ef194 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index df2092153ed..d2b6221d4d4 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index d2a0bdaecb4..21c1e58bfc2 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Test.idl b/TAO/tests/Collocation_Oneway_Tests/Test.idl
index dc244b3ff58..2bad10dbf83 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Test.idl
+++ b/TAO/tests/Collocation_Oneway_Tests/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Collocation_Opportunities/test.idl b/TAO/tests/Collocation_Opportunities/test.idl
index 41f0d3e8e94..e94d427f80a 100644
--- a/TAO/tests/Collocation_Opportunities/test.idl
+++ b/TAO/tests/Collocation_Opportunities/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp
index e39e0d96191..e99d68887d7 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "TestC.h"
diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h
index 8f6557cdec8..cc58f128c58 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Tests/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index cabcd9145d9..65b1c37b705 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 3a25039b7ab..043a6968853 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 98f37e052e3..7a26f5fcf0c 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocation_Tests/Test.idl b/TAO/tests/Collocation_Tests/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Collocation_Tests/Test.idl
+++ b/TAO/tests/Collocation_Tests/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.cpp
+++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Connect_Strategy_Test/Test.idl b/TAO/tests/Connect_Strategy_Test/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Connect_Strategy_Test/Test.idl
+++ b/TAO/tests/Connect_Strategy_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Connection_Failure/test.idl b/TAO/tests/Connection_Failure/test.idl
index 0e52e7f2a6a..28742b18318 100644
--- a/TAO/tests/Connection_Failure/test.idl
+++ b/TAO/tests/Connection_Failure/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp
index 71eefd78ad9..60ca99b1653 100644
--- a/TAO/tests/Connection_Purging/test_i.cpp
+++ b/TAO/tests/Connection_Purging/test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "test_i.h"
void
diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index 4b12aa9e33c..e17a4ae34a1 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Connection_Timeout/Test.idl b/TAO/tests/Connection_Timeout/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Connection_Timeout/Test.idl
+++ b/TAO/tests/Connection_Timeout/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.cpp b/TAO/tests/Crash_On_Write/Crash_Task.cpp
index 98bfa8fc189..fea99bbb218 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.cpp
+++ b/TAO/tests/Crash_On_Write/Crash_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Crash_Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Crash_On_Write/Crash_Task.h b/TAO/tests/Crash_On_Write/Crash_Task.h
index d9a6953ac94..b4d9a7b63b4 100644
--- a/TAO/tests/Crash_On_Write/Crash_Task.h
+++ b/TAO/tests/Crash_On_Write/Crash_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CRASH_TASK_H
#define CRASH_TASK_H
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index fba9d40f60d..e3610f5b633 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Oneway_Receiver.h"
Oneway_Receiver::Oneway_Receiver (void)
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index 141636d9361..1e28f29784d 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAY_RECEIVER_H
#define ONEWAY_RECEIVER_H
diff --git a/TAO/tests/Crash_On_Write/Test.idl b/TAO/tests/Crash_On_Write/Test.idl
index d57fc69976f..052d1452a78 100644
--- a/TAO/tests/Crash_On_Write/Test.idl
+++ b/TAO/tests/Crash_On_Write/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index c23bfc16932..bd41b09e3f9 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Crashed_Callback.h"
Crashed_Callback::Crashed_Callback (void)
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index e8a17b21832..a6bd7ccc13f 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CRASHED_CALLBACK_CRASHED_CALLBACK_H
#define CRASHED_CALLBACK_CRASHED_CALLBACK_H
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 0f0a6f17474..697eddf636e 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Service.h"
Service::Service (void)
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index 72a4d318518..709dfb318db 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef CRASHED_CALLBACK_SERVICE_H
#define CRASHED_CALLBACK_SERVICE_H
diff --git a/TAO/tests/Crashed_Callback/Test.idl b/TAO/tests/Crashed_Callback/Test.idl
index d81f1f3638a..b1a22e6d4cb 100644
--- a/TAO/tests/Crashed_Callback/Test.idl
+++ b/TAO/tests/Crashed_Callback/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
index 7841eb4a9ed..84c7d8b6fda 100644
--- a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
+++ b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
project(*idl): taoidldefaults {
IDL_Files {
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index dd3d210a593..a7ec401629a 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -1,8 +1,5 @@
/* -*- C++ -*- */
-//
-// $Id$
-//
#include "tao/DynamicInterface/Request.h" /* This must come first for
G++ 3.4 or better */
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.h b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.h
index 59b7b432229..21ce9999b1f 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.h
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.h
@@ -1,8 +1,5 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef DII_REPLY_HANDLER_H
#define DII_REPLY_HANDLER_H
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
index c55191719da..345f983b3a0 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "orb_initializer.h"
#include "server_interceptor.h"
diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.h b/TAO/tests/DII_AMI_Forward/orb_initializer.h
index c19c9bf6d99..0e2986a0a93 100644
--- a/TAO/tests/DII_AMI_Forward/orb_initializer.h
+++ b/TAO/tests/DII_AMI_Forward/orb_initializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/DII_AMI_Forward/server.cpp b/TAO/tests/DII_AMI_Forward/server.cpp
index f9b0ef97a4b..9e62dcf8532 100644
--- a/TAO/tests/DII_AMI_Forward/server.cpp
+++ b/TAO/tests/DII_AMI_Forward/server.cpp
@@ -1,8 +1,5 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "test_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DII_AMI_Forward/test_i.cpp b/TAO/tests/DII_AMI_Forward/test_i.cpp
index 934cafbbba7..ca593687f77 100644
--- a/TAO/tests/DII_AMI_Forward/test_i.cpp
+++ b/TAO/tests/DII_AMI_Forward/test_i.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/DII_AMI_Forward/test_i.h b/TAO/tests/DII_AMI_Forward/test_i.h
index d0968c6be9d..7ea49cad5b5 100644
--- a/TAO/tests/DII_AMI_Forward/test_i.h
+++ b/TAO/tests/DII_AMI_Forward/test_i.h
@@ -1,8 +1,5 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index 38f5464a7dd..ca5c1aa295a 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/DynamicInterface/Request.h" /* This must come first for
G++ 3.4 or better */
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
index cf110451beb..cb4e4fdb7e6 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 976993601f0..128f6d994db 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 699055f9daf..8fc53671693 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 792a5a89711..8c44fd06667 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Test.idl b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
index e3e8a70dc4d..181bdfee590 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index 5a5c8ad8d83..1459ceae8b7 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/DynamicInterface/Request.h" /* This must come first for
G++ 3.4 or better */
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
index cf110451beb..cb4e4fdb7e6 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index 61eeb7e06e0..a6c02d96bd3 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 98fa55930f2..4050797f772 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index 7729e61fac4..2f8dd3327cb 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Test.idl b/TAO/tests/DII_Collocation_Tests/twoway/Test.idl
index f60690dee31..8b6a4e73e3d 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Test.idl
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp
index 3fd90cc406d..aee804eb5dd 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.cpp
+++ b/TAO/tests/DSI_AMH/Roundtrip.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/DynamicInterface/Server_Request.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
#include "tao/AnyTypeCode/NVList.h"
diff --git a/TAO/tests/DSI_AMH/Roundtrip.h b/TAO/tests/DSI_AMH/Roundtrip.h
index f6436ec5f32..16d109d0dde 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.h
+++ b/TAO/tests/DSI_AMH/Roundtrip.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ROUNDTRIP_H
#define ROUNDTRIP_H
diff --git a/TAO/tests/DSI_AMH/Test.idl b/TAO/tests/DSI_AMH/Test.idl
index 057177a145b..41fba763de2 100644
--- a/TAO/tests/DSI_AMH/Test.idl
+++ b/TAO/tests/DSI_AMH/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// A simple module to avoid namespace pollution
module Test
diff --git a/TAO/tests/DSI_AMI_Gateway/test.idl b/TAO/tests/DSI_AMI_Gateway/test.idl
index 5c7f0d32d2c..6d2ce5475a7 100644
--- a/TAO/tests/DSI_AMI_Gateway/test.idl
+++ b/TAO/tests/DSI_AMI_Gateway/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
typedef sequence<long> DSI_LongSeq;
diff --git a/TAO/tests/DSI_Gateway/test.idl b/TAO/tests/DSI_Gateway/test.idl
index 5c7f0d32d2c..6d2ce5475a7 100644
--- a/TAO/tests/DSI_Gateway/test.idl
+++ b/TAO/tests/DSI_Gateway/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
typedef sequence<long> DSI_LongSeq;
diff --git a/TAO/tests/DiffServ/test.idl b/TAO/tests/DiffServ/test.idl
index 3ed4d3d20ea..cd69baf2211 100644
--- a/TAO/tests/DiffServ/test.idl
+++ b/TAO/tests/DiffServ/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test.idl b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test.idl
index 63533c390fc..ab80e211ea4 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test.idl
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
index 7107990c9fc..02b682d2f10 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
index 828d5e3069b..ac0847222d2 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
index 313393fc02c..299b0c4466b 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
index 93afd1f3913..751390c4e00 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Test.idl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Test.idl
index 0e2180b8481..16c876e8dfd 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Test.idl
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
index 313393fc02c..299b0c4466b 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
index 93afd1f3913..751390c4e00 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Test.idl b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Test.idl
index 0e2180b8481..16c876e8dfd 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Test.idl
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/FL_Cube/test.idl b/TAO/tests/FL_Cube/test.idl
index 6f1397b3008..6dd5877dc83 100644
--- a/TAO/tests/FL_Cube/test.idl
+++ b/TAO/tests/FL_Cube/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server {
diff --git a/TAO/tests/Faults/test.idl b/TAO/tests/Faults/test.idl
index 9ee2052e8b8..ff7ca574cd1 100644
--- a/TAO/tests/Faults/test.idl
+++ b/TAO/tests/Faults/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Callback
{
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index 56c489c9f5a..712826479b7 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
index 7a3de11b440..995a5646e39 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef JAVA_BIG_REPLY_CLIENT_TASK_H
#define JAVA_BIG_REPLY_CLIENT_TASK_H
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index df4950cf28c..e9e7dbf5846 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Payload_Receiver.h"
Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index 41b4af2ac29..8f7a80057a5 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef JAVA_BIG_REQUEST_PAYLOAD_RECEIVER_H
#define JAVA_BIG_REQUEST_PAYLOAD_RECEIVER_H
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Test.idl b/TAO/tests/GIOP_Fragments/Java_Big_Request/Test.idl
index 902aed29cf4..f3f34494c57 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Test.idl
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index df4950cf28c..e9e7dbf5846 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Payload_Receiver.h"
Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index 24717072a73..f7b15e2132c 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef PMB_WITH_FRAGMENTS_PAYLOAD_RECEIVER_H
#define PMB_WITH_FRAGMENTS_PAYLOAD_RECEIVER_H
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Test.idl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Test.idl
index 39951f72137..4bd8c616764 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Test.idl
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h
index 2008a85d139..8d9cc6a64b5 100644
--- a/TAO/tests/Hang_Shutdown/test_i.h
+++ b/TAO/tests/Hang_Shutdown/test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TAO_HANG_TEST_I_H
#define TAO_HANG_TEST_I_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Hello/Test.idl b/TAO/tests/Hello/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Hello/Test.idl
+++ b/TAO/tests/Hello/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index 4242c5294a4..8d31a00870f 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
#include "HelloWorld.h"
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index 39153a73819..319f621a6e9 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index 9fe083d79ed..0c67b45ea2b 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "HelloWorld.h"
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index ec68e481c8b..9b4de135534 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLOWORLD_H
#define HELLOWORLD_H
diff --git a/TAO/tests/ICMG_Any_Bug/Test.idl b/TAO/tests/ICMG_Any_Bug/Test.idl
index 70c1c911dd0..5ec025bd3db 100644
--- a/TAO/tests/ICMG_Any_Bug/Test.idl
+++ b/TAO/tests/ICMG_Any_Bug/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp
index a29bc9495f7..1891762834c 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.cpp
+++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "simple_test_i.h"
diff --git a/TAO/tests/IORTable_Locator/simple_test_i.h b/TAO/tests/IORTable_Locator/simple_test_i.h
index 0a5f17eeeda..9918438def1 100644
--- a/TAO/tests/IORTable_Locator/simple_test_i.h
+++ b/TAO/tests/IORTable_Locator/simple_test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus.idl b/TAO/tests/IOR_Endpoint_Hostnames/bogus.idl
index 48c3ef6ef34..d4f34b5cdb8 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus.idl
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index 65a72f2be16..f46dd98bbe7 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef bogus_h
#define bogus_h
diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/IPV6/Hello.cpp
+++ b/TAO/tests/IPV6/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/IPV6/Test.idl b/TAO/tests/IPV6/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/IPV6/Test.idl
+++ b/TAO/tests/IPV6/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Leader_Followers/test.idl b/TAO/tests/Leader_Followers/test.idl
index c90404d1910..7f07c39c48e 100644
--- a/TAO/tests/Leader_Followers/test.idl
+++ b/TAO/tests/Leader_Followers/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/LongDouble/Global.cpp b/TAO/tests/LongDouble/Global.cpp
index 19c6d96d6d1..b09e8d927c9 100644
--- a/TAO/tests/LongDouble/Global.cpp
+++ b/TAO/tests/LongDouble/Global.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Global.h"
long double
diff --git a/TAO/tests/LongDouble/LongDoubleTest.h b/TAO/tests/LongDouble/LongDoubleTest.h
index c48cd001181..f8b0c2a97c1 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.h
+++ b/TAO/tests/LongDouble/LongDoubleTest.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LONGDOUBLETEST_H
#define LONGDOUBLETEST_H
diff --git a/TAO/tests/LongDouble/Test.idl b/TAO/tests/LongDouble/Test.idl
index 3a46b019b12..1d4ef7cc799 100644
--- a/TAO/tests/LongDouble/Test.idl
+++ b/TAO/tests/LongDouble/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index a8a17609364..f9ef1abf663 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "AMI_Manager.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 81eb5edbc9b..5492961d17c 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Controller.h"
Controller::Controller (void)
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 8bb3ea0fe05..6d6eac005d3 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Manager.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 23d94be0ed7..de0b40dd319 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LONGUPCALLS_MANAGER_H
#define LONGUPCALLS_MANAGER_H
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index 3e8ea30e8ea..f6ed3bf55db 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Manager_Handler.h"
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 687d936fa38..dfb8c07e11f 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef LONGUPCALLS_MANAGER_HANDLER_H
#define LONGUPCALLS_MANAGER_HANDLER_H
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 24d1baf9ead..27649c77a50 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/MT_BiDir/Client_Task.h b/TAO/tests/MT_BiDir/Client_Task.h
index 778e9618258..f0e94c59e2a 100644
--- a/TAO/tests/MT_BiDir/Client_Task.h
+++ b/TAO/tests/MT_BiDir/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MT_BIDIR_CLIENT_TASK_H
#define MT_BIDIR_CLIENT_TASK_H
diff --git a/TAO/tests/MT_BiDir/Receiver.idl b/TAO/tests/MT_BiDir/Receiver.idl
index b8e7383670e..693e0d5765a 100644
--- a/TAO/tests/MT_BiDir/Receiver.idl
+++ b/TAO/tests/MT_BiDir/Receiver.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Receiver
{
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index 72b6bf4f7aa..900e505506a 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver_i.h"
Receiver_i::Receiver_i (void)
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index 398955cca27..8f426fb3106 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MT_BIDIR_RECEIVER_I_H
#define MT_BIDIR_RECEIVER_I_H
diff --git a/TAO/tests/MT_BiDir/Sender.idl b/TAO/tests/MT_BiDir/Sender.idl
index 9aa036f3327..b3927c57c9b 100644
--- a/TAO/tests/MT_BiDir/Sender.idl
+++ b/TAO/tests/MT_BiDir/Sender.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver.idl"
interface Sender
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index d095f295801..c2919011234 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "Sender_i.h"
diff --git a/TAO/tests/MT_Server/test.idl b/TAO/tests/MT_Server/test.idl
index aa227c3b110..0ea52c23f40 100644
--- a/TAO/tests/MT_Server/test.idl
+++ b/TAO/tests/MT_Server/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 34ab2dbfc26..97770fe0546 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index d5ba569ca0d..59bd1886a34 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MT_TIMEOUT_CLIENT_TASK_H
#define MT_TIMEOUT_CLIENT_TASK_H
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index a7a022e9e91..0b0503d31c5 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
diff --git a/TAO/tests/MT_Timeout/Server_Task.h b/TAO/tests/MT_Timeout/Server_Task.h
index b3133abff1d..7890d0970e2 100644
--- a/TAO/tests/MT_Timeout/Server_Task.h
+++ b/TAO/tests/MT_Timeout/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SERVER_TASK_H
#define SERVER_TASK_H
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index fa61211d0f2..c356908ea59 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Sleep_Service.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index 0107c5836ec..bf4021284fa 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SLEEP_SERVICE_H
#define SLEEP_SERVICE_H
diff --git a/TAO/tests/MT_Timeout/Test.idl b/TAO/tests/MT_Timeout/Test.idl
index 0d92a794abb..0020cabe600 100644
--- a/TAO/tests/MT_Timeout/Test.idl
+++ b/TAO/tests/MT_Timeout/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
index ad83199b24e..206dc46fb2c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Test.idl b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Test.idl
index c546c828670..e06a9b04c45 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Test.idl
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Muxed_GIOP_Versions/test.idl b/TAO/tests/Muxed_GIOP_Versions/test.idl
index aa227c3b110..0ea52c23f40 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test.idl
+++ b/TAO/tests/Muxed_GIOP_Versions/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 0ba1e8728fa..351c094666b 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Muxing/Client_Task.h b/TAO/tests/Muxing/Client_Task.h
index bca7ea378fe..6f55129af67 100644
--- a/TAO/tests/Muxing/Client_Task.h
+++ b/TAO/tests/Muxing/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MUXING_CLIENT_TASK_H
#define MUXING_CLIENT_TASK_H
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index b8953970bdb..e0cf3c1c60f 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Receiver.h"
Receiver::Receiver (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index a69e6d9fc5d..19ccb9cad52 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MUXING_RECEIVER_H
#define MUXING_RECEIVER_H
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index e51cb2f7168..c0091912959 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
diff --git a/TAO/tests/Muxing/Server_Task.h b/TAO/tests/Muxing/Server_Task.h
index 5004b37e1f0..1e2a05604e1 100644
--- a/TAO/tests/Muxing/Server_Task.h
+++ b/TAO/tests/Muxing/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef MUXING_SERVER_TASK_H
#define MUXING_SERVER_TASK_H
diff --git a/TAO/tests/Muxing/Test.idl b/TAO/tests/Muxing/Test.idl
index af7010bd6c0..ca938a8f79c 100644
--- a/TAO/tests/Muxing/Test.idl
+++ b/TAO/tests/Muxing/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Native_Exceptions/test.idl b/TAO/tests/Native_Exceptions/test.idl
index 9ee5a442985..704ee977bfd 100644
--- a/TAO/tests/Native_Exceptions/test.idl
+++ b/TAO/tests/Native_Exceptions/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server
{
diff --git a/TAO/tests/Nested_Event_Loop/test.idl b/TAO/tests/Nested_Event_Loop/test.idl
index 2a0de7543ad..fec839c8750 100644
--- a/TAO/tests/Nested_Event_Loop/test.idl
+++ b/TAO/tests/Nested_Event_Loop/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
typedef sequence<octet> act;
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 3e29c2e7fb6..00417759359 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
index d41c7ae468a..773795e328a 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 5304ab5471c..dc13599e2c7 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "TreeBaseS.h"
#include "TreeControllerS.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.idl b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.idl
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 0a5be851783..ad0080d389b 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index aaa691f51c8..21c0a669204 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/ORB_shutdown/Test.idl b/TAO/tests/ORB_shutdown/Test.idl
index f6a0c676b65..33aa9da6c17 100644
--- a/TAO/tests/ORB_shutdown/Test.idl
+++ b/TAO/tests/ORB_shutdown/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index 4c1096fdec8..7dd7e3cec93 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "TestC.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 04fb3af1932..3cee6eba223 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Ondemand_Write/Test.idl b/TAO/tests/Ondemand_Write/Test.idl
index 59719f1eee7..95f607d9e0d 100644
--- a/TAO/tests/Ondemand_Write/Test.idl
+++ b/TAO/tests/Ondemand_Write/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index d36b6d9f84d..07df4ffea40 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Oneway_Buffering.h"
Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index b201e475f14..e0a2593a1e2 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAY_BUFFERING_H
#define ONEWAY_BUFFERING_H
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index b788fa1b5a5..38e92acfb0d 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Oneway_Buffering_Admin.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index e8e226db63e..8942925272f 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAY_BUFFERING_ADMIN_H
#define ONEWAY_BUFFERING_ADMIN_H
diff --git a/TAO/tests/Oneway_Buffering/Test.idl b/TAO/tests/Oneway_Buffering/Test.idl
index 1e266d0ea9e..97c8f46b141 100644
--- a/TAO/tests/Oneway_Buffering/Test.idl
+++ b/TAO/tests/Oneway_Buffering/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 5600b0a9eb1..4e00819f0f5 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
index 4fca46e6fde..33681d004e0 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAYS_INVOKING_TWOWAYS_CLIENT_TASK_H
#define ONEWAYS_INVOKING_TWOWAYS_CLIENT_TASK_H
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 4e97b7ca0ca..86260515097 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
index a6ecae2217a..b00eef99fbf 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAYS_INVOKING_TWOWAYS_SERVER_TASK_H
#define ONEWAYS_INVOKING_TWOWAYS_SERVER_TASK_H
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Test.idl b/TAO/tests/Oneways_Invoking_Twoways/Test.idl
index 6eeeda5d336..45bd4d1e9f2 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Test.idl
+++ b/TAO/tests/Oneways_Invoking_Twoways/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp
index 8f5c72b2c0a..1f1a0cbf0a9 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.cpp
+++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index 594576de08e..f802f09dd1d 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/POA/Deactivate_Object/Test.idl b/TAO/tests/POA/Deactivate_Object/Test.idl
index 48c0abba813..6c17817b32f 100644
--- a/TAO/tests/POA/Deactivate_Object/Test.idl
+++ b/TAO/tests/POA/Deactivate_Object/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.cpp
+++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/POA/EndpointPolicy/Test.idl b/TAO/tests/POA/EndpointPolicy/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/POA/EndpointPolicy/Test.idl
+++ b/TAO/tests/POA/EndpointPolicy/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
index f1b20a22fbf..92a8355c179 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
index 09ccb0a27f0..8d7e87ee689 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "Servant_Activator.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/Reference_Counting/Hello.idl b/TAO/tests/POA/Reference_Counting/Hello.idl
index de1bd50f878..0007d352397 100644
--- a/TAO/tests/POA/Reference_Counting/Hello.idl
+++ b/TAO/tests/POA/Reference_Counting/Hello.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Hello {
void moo ();
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test.idl b/TAO/tests/Parallel_Connect_Strategy/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test.idl
+++ b/TAO/tests/Parallel_Connect_Strategy/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
index 0a5be851783..ad0080d389b 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 1017fb7be50..7bdf685ff97 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -1,8 +1,5 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Policies/test.idl b/TAO/tests/Policies/test.idl
index 402ff77e53d..fe6221517b5 100644
--- a/TAO/tests/Policies/test.idl
+++ b/TAO/tests/Policies/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index 7b5dc285c54..dee623c5b98 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
index b8e03992c7e..598e4669ab9 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_INTERCEPTOR_TYPE_H
#define TAO_INTERCEPTOR_TYPE_H
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 33d2e965627..4f8486c4cea 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index d2db35c5110..78a1655f7cd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 747d3cd7887..8370ccc962f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
index af231fe1540..88fd5ffb5b8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Test.idl b/TAO/tests/Portable_Interceptors/Bug_2133/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index d2db35c5110..78a1655f7cd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index d93fbb3fc93..a50d948a0a2 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index a118c3e3c1f..6175ecbfc26 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "test_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index 4a95a72c07e..9dc0cb89b6e 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef COLLOCATED_TEST_CLIENT_TASK_H
#define COLLOCATED_TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index 4ed6e54b12a..ff9d33073a1 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TEST_CLIENT_TASK_H
#define TEST_CLIENT_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
index 281bba57562..cb7fc27ec05 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
index d2d875268d0..8cf7c24d80d 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index 2bdb0bd80e2..cb446a73d5f 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index 45170534be6..1f166b93d43 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index ad369d2b7ed..dd22dcc19d3 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Server_ORBInitializer.h"
#include "server_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index 6bffdffaf04..9554057647d 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/RTCORBA/Banded_Connections/test.idl b/TAO/tests/RTCORBA/Banded_Connections/test.idl
index ae526bbfd2f..c19bd8f3098 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/test.idl
+++ b/TAO/tests/RTCORBA/Banded_Connections/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
index cc6f1339fc7..9e925634654 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "interceptors.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/test.idl b/TAO/tests/RTCORBA/Bug_3382_Regression/test.idl
index ce79aec2ee7..7bc45dcae28 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/test.idl
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test.idl b/TAO/tests/RTCORBA/Bug_3643_Regression/test.idl
index 3bc8f9af25c..d72798def5e 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test.idl
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index cc6f1339fc7..9e925634654 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#include "Client_ORBInitializer.h"
#include "interceptors.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index c6cc9c9ebb8..e8e845f1793 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -1,7 +1,4 @@
// -*- C++ -*-
-//
-// $Id$
-//
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/RTCORBA/Client_Propagated/test.idl b/TAO/tests/RTCORBA/Client_Propagated/test.idl
index ce79aec2ee7..7bc45dcae28 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/test.idl
+++ b/TAO/tests/RTCORBA/Client_Propagated/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Client_Protocol/test.idl b/TAO/tests/RTCORBA/Client_Protocol/test.idl
index 4a73b5f42e6..ecb517bf669 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/test.idl
+++ b/TAO/tests/RTCORBA/Client_Protocol/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Diffserv/test.idl b/TAO/tests/RTCORBA/Diffserv/test.idl
index 3ed4d3d20ea..cd69baf2211 100644
--- a/TAO/tests/RTCORBA/Diffserv/test.idl
+++ b/TAO/tests/RTCORBA/Diffserv/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl
index 3bc8f9af25c..d72798def5e 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/test.idl b/TAO/tests/RTCORBA/Explicit_Binding/test.idl
index b50f6cfef47..94f864ff686 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/test.idl
+++ b/TAO/tests/RTCORBA/Explicit_Binding/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/test.idl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/test.idl
index 521ad2529af..6869ac5e57f 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/test.idl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test.idl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test.idl
index 331c73291bd..ea6131d39d8 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test.idl
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/RTCORBA/Private_Connection/test.idl b/TAO/tests/RTCORBA/Private_Connection/test.idl
index b50f6cfef47..94f864ff686 100644
--- a/TAO/tests/RTCORBA/Private_Connection/test.idl
+++ b/TAO/tests/RTCORBA/Private_Connection/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Server_Declared/test.idl b/TAO/tests/RTCORBA/Server_Declared/test.idl
index ce79aec2ee7..7bc45dcae28 100644
--- a/TAO/tests/RTCORBA/Server_Declared/test.idl
+++ b/TAO/tests/RTCORBA/Server_Declared/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Server_Protocol/test.idl b/TAO/tests/RTCORBA/Server_Protocol/test.idl
index 7fd0cd6f651..73734cfb758 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/test.idl
+++ b/TAO/tests/RTCORBA/Server_Protocol/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Test
{
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test.idl b/TAO/tests/RTCORBA/Thread_Pool/test.idl
index 3d264c4f51a..e2f76b6d01c 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test.idl
+++ b/TAO/tests/RTCORBA/Thread_Pool/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 4aab39a74d8..22e9d2969df 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Oneway_Receiver.h"
#include "Shutdown_Helper.h"
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index 6808ff66e5c..f7653e237c2 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef ONEWAY_RECEIVER_H
#define ONEWAY_RECEIVER_H
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index c001ac11463..61cff1817cd 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Shutdown_Helper.h"
Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 7262e575081..994bf94396b 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SHUTDOWN_HELPER_H
#define SHUTDOWN_HELPER_H
diff --git a/TAO/tests/Reliable_Oneways/Test.idl b/TAO/tests/Reliable_Oneways/Test.idl
index a083bd6412c..2cbce03afa9 100644
--- a/TAO/tests/Reliable_Oneways/Test.idl
+++ b/TAO/tests/Reliable_Oneways/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Servant_To_Reference_Test/Test.idl b/TAO/tests/Servant_To_Reference_Test/Test.idl
index 39548dcbf88..5563d3bac29 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test.idl
+++ b/TAO/tests/Servant_To_Reference_Test/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
index 871deea0c89..6f98d20f46f 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
One_Impl::One_Impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index c478d11253c..a33ac60baf4 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index f5ed7ac03b0..b47d464f483 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index 689d8c3cd7b..ab8730f8b3f 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index 2a0151b78f8..b1e5ebaa08b 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Ping_Service.h"
Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index b1f459c1cf2..1488a615128 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef SERVER_LEAKS_PING_SERVICE_H
#define SERVER_LEAKS_PING_SERVICE_H
diff --git a/TAO/tests/Server_Leaks/Test.idl b/TAO/tests/Server_Leaks/Test.idl
index 3f71918cab1..11cfe70a9f2 100644
--- a/TAO/tests/Server_Leaks/Test.idl
+++ b/TAO/tests/Server_Leaks/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp
index 0f62f20b906..733fe2bfcaf 100644
--- a/TAO/tests/Server_Port_Zero/Hello.cpp
+++ b/TAO/tests/Server_Port_Zero/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 3a840d3d88d..8b2124d9fe5 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/Server_Port_Zero/Test.idl b/TAO/tests/Server_Port_Zero/Test.idl
index 3c0976e106d..6cd2805ea74 100644
--- a/TAO/tests/Server_Port_Zero/Test.idl
+++ b/TAO/tests/Server_Port_Zero/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
diff --git a/TAO/tests/Single_Read/test.idl b/TAO/tests/Single_Read/test.idl
index 27f4c8e605f..ff8faaedee8 100644
--- a/TAO/tests/Single_Read/test.idl
+++ b/TAO/tests/Single_Read/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/Skeleton_Inheritance/idl_1.idl b/TAO/tests/Skeleton_Inheritance/idl_1.idl
index d9f1d7950c4..d123d0cef68 100644
--- a/TAO/tests/Skeleton_Inheritance/idl_1.idl
+++ b/TAO/tests/Skeleton_Inheritance/idl_1.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Skeleton_Inheritance
{
diff --git a/TAO/tests/Skeleton_Inheritance/idl_2.idl b/TAO/tests/Skeleton_Inheritance/idl_2.idl
index ccf628c4436..867427cfc93 100644
--- a/TAO/tests/Skeleton_Inheritance/idl_2.idl
+++ b/TAO/tests/Skeleton_Inheritance/idl_2.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "idl_1.idl"
diff --git a/TAO/tests/Skeleton_Inheritance/idl_3.idl b/TAO/tests/Skeleton_Inheritance/idl_3.idl
index edb70e292f6..fec5961ef4d 100644
--- a/TAO/tests/Skeleton_Inheritance/idl_3.idl
+++ b/TAO/tests/Skeleton_Inheritance/idl_3.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "idl_2.idl"
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
index 632ffeb6f6e..c532071b5c6 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.h
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef INTERFACE_3_I_H_
#define INTERFACE_3_I_H_
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 9bbaa1a9caf..25f130a5545 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Client_Task.h"
diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h
index 1858bf6c12c..85ca7e45a0c 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.h
+++ b/TAO/tests/Stack_Recursion/Client_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STACK_RECURSION_CLIENT_TASK_H
#define STACK_RECURSION_CLIENT_TASK_H
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index c221af4b87c..ea06ddcb33e 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Sender.h"
Sender::Sender (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index 5af96f9d9b5..d0b38efbcfa 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STACK_RECURSION_SENDER_H
#define STACK_RECURSION_SENDER_H
diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp
index 15daa14ac9a..5a3cf60f539 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Server_Task.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Server_Task.h"
#include "Sender.h"
diff --git a/TAO/tests/Stack_Recursion/Server_Task.h b/TAO/tests/Stack_Recursion/Server_Task.h
index 78bb61e5b7c..0bada3e7344 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.h
+++ b/TAO/tests/Stack_Recursion/Server_Task.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef STACK_RECURSION_SERVER_TASK_H
#define STACK_RECURSION_SERVER_TASK_H
diff --git a/TAO/tests/Stack_Recursion/Test.idl b/TAO/tests/Stack_Recursion/Test.idl
index 91adb6e4bf6..4904d6a3e39 100644
--- a/TAO/tests/Stack_Recursion/Test.idl
+++ b/TAO/tests/Stack_Recursion/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Test
{
diff --git a/TAO/tests/Timed_Buffered_Oneways/test.idl b/TAO/tests/Timed_Buffered_Oneways/test.idl
index 3035dc7f5fd..084df49b35c 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test.idl
+++ b/TAO/tests/Timed_Buffered_Oneways/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
{
diff --git a/TAO/tests/Timeout/test.idl b/TAO/tests/Timeout/test.idl
index 5481e3f26f0..aee6a39899c 100644
--- a/TAO/tests/Timeout/test.idl
+++ b/TAO/tests/Timeout/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface Simple_Server {
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index ca3287f6e3d..7909a5a3de1 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "First_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index b7775ca7721..a28794209cd 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "tao/ORB_Core.h"
#include "tao/debug.h"
#include "tao/Transport_Cache_Manager.h"
diff --git a/TAO/tests/Two_Objects/Two_Objects.idl b/TAO/tests/Two_Objects/Two_Objects.idl
index a4c985c2eac..4ed651347a0 100644
--- a/TAO/tests/Two_Objects/Two_Objects.idl
+++ b/TAO/tests/Two_Objects/Two_Objects.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
module Two_Objects_Test
{
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index 536534ed518..7c88437acac 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "worker.h"
diff --git a/TAO/tests/UNKNOWN_Exception/test.idl b/TAO/tests/UNKNOWN_Exception/test.idl
index 8502c8d5cd8..27e54cbd088 100644
--- a/TAO/tests/UNKNOWN_Exception/test.idl
+++ b/TAO/tests/UNKNOWN_Exception/test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
interface test
diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp
index a9d7af19f6e..f9d1c47bcd8 100644
--- a/TAO/tests/ZIOP/Hello.cpp
+++ b/TAO/tests/ZIOP/Hello.cpp
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h
index 239f659a2a0..12770427014 100644
--- a/TAO/tests/ZIOP/Hello.h
+++ b/TAO/tests/ZIOP/Hello.h
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
#ifndef HELLO_H
#define HELLO_H
diff --git a/TAO/tests/ZIOP/Test.idl b/TAO/tests/ZIOP/Test.idl
index 7e5383ef267..1977f88c812 100644
--- a/TAO/tests/ZIOP/Test.idl
+++ b/TAO/tests/ZIOP/Test.idl
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
/// Put the interfaces in a module, to avoid global namespace pollution
module Test