summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ACEXML/common/AttributesImpl.inl2
-rw-r--r--ACE/ace/Abstract_Timer_Queue.cpp2
-rw-r--r--ACE/ace/Abstract_Timer_Queue.h2
-rw-r--r--ACE/ace/Cache_Map_Manager_T.inl2
-rw-r--r--ACE/ace/Cached_Connect_Strategy_T.cpp2
-rw-r--r--ACE/ace/Caching_Strategies_T.cpp2
-rw-r--r--ACE/ace/Caching_Strategies_T.inl2
-rw-r--r--ACE/ace/Cleanup_Strategies_T.cpp2
-rw-r--r--ACE/ace/Event_Handler_Handle_Timeout_Upcall.h2
-rw-r--r--ACE/ace/Hashable.cpp2
-rw-r--r--ACE/ace/Notification_Strategy.inl2
-rw-r--r--ACE/ace/QtReactor/QtReactor.cpp2
-rw-r--r--ACE/ace/Recyclable.cpp1
-rw-r--r--ACE/ace/Recyclable.inl2
-rw-r--r--ACE/ace/Refcountable_T.inl2
-rw-r--r--ACE/ace/Timer_Queue_Iterator.cpp2
-rw-r--r--ACE/ace/Timer_Queue_Iterator.h2
-rw-r--r--ACE/ace/UUID.cpp2
-rw-r--r--ACE/ace/UUID.inl2
-rw-r--r--ACE/ace/config-win32-borland.h2
-rwxr-xr-xACE/bin/zap_svn_id.pl5
-rw-r--r--CIAO/ciao/Valuetype_Factories/Factories.mpc1
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/duration.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/duration.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/string_seq.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h2
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp1
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl2
-rw-r--r--CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl2
-rw-r--r--CIAO/examples/BasicSP/BMDevice/BMDevice.idl1
-rw-r--r--CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl2
-rw-r--r--CIAO/examples/Hello_Event/Sender/Sender.idl2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp2
-rw-r--r--CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl2
-rw-r--r--CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc2
-rw-r--r--CIAO/tests/CIDL/CodeGen/CodeGen.idl2
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp1
-rw-r--r--CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp1
-rw-r--r--CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl2
-rw-r--r--CIAO/tests/Minimum/Sender/Sender.idl2
-rw-r--r--CIAO/tests/TTSCTest/Sender/Sender.idl2
-rw-r--r--CIAO/tests/TTSConnContext/Sender/Sender.idl2
-rw-r--r--CIAO/tests/Thread/Sender/Sender.idl2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp1
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl2
-rw-r--r--CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp1
-rw-r--r--CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_Base.idl2
-rw-r--r--DAnCE/dance/Deployment/Deployment_TargetData.idl2
-rw-r--r--DAnCE/tests/Config_Handlers/Config_Handlers.mpc2
-rw-r--r--DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl1
-rw-r--r--DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Config_Handlers.mpc2
-rw-r--r--DAnCE/tools/Config_Handlers/DataType_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/Property_Handler.cpp2
-rw-r--r--DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/utils.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/utils.h2
-rw-r--r--TAO/examples/OBV/Typed_Events/Client_i.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/client.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/Grid_Client_i.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/Persistent_Client_i.cpp1
-rw-r--r--TAO/examples/Persistent_Grid/Simple_util.cpp2
-rw-r--r--TAO/examples/RTCORBA/Activity/Activity.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/Builder.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/Job_i.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/POA_Holder.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/Periodic_Task.cpp2
-rw-r--r--TAO/examples/RTCORBA/Activity/Task_Stats.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/Task_Stats.inl2
-rw-r--r--TAO/examples/RTCORBA/Activity/Thread_Task.cpp1
-rw-r--r--TAO/examples/RTScheduling/DT_Creator.cpp2
-rw-r--r--TAO/examples/RTScheduling/DT_Creator.h2
-rw-r--r--TAO/examples/RTScheduling/FP_Scheduling.idl2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp1
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h1
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h1
-rw-r--r--TAO/examples/RTScheduling/Job_i.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h1
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/test.cpp2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/test.h1
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduling.idl2
-rw-r--r--TAO/examples/RTScheduling/POA_Holder.cpp2
-rw-r--r--TAO/examples/RTScheduling/POA_Holder.h2
-rw-r--r--TAO/examples/RTScheduling/Starter.cpp2
-rw-r--r--TAO/examples/RTScheduling/Starter.h1
-rw-r--r--TAO/examples/RTScheduling/Synch.idl2
-rw-r--r--TAO/examples/RTScheduling/Synch_i.cpp2
-rw-r--r--TAO/examples/RTScheduling/Synch_i.h2
-rw-r--r--TAO/examples/RTScheduling/Task_Stats.cpp1
-rw-r--r--TAO/examples/RTScheduling/Task_Stats.inl2
-rw-r--r--TAO/examples/RTScheduling/Thread_Task.cpp2
-rw-r--r--TAO/examples/RTScheduling/Thread_Task.h1
-rw-r--r--TAO/examples/Simple/bank/Bank_Client_i.cpp2
-rw-r--r--TAO/examples/Simple/echo/Echo_Client_i.cpp2
-rw-r--r--TAO/examples/Simple/echo/client.cpp2
-rw-r--r--TAO/examples/Simple/grid/Grid_Client_i.cpp2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date_Client_i.cpp2
-rw-r--r--TAO/examples/Simple/time/Time_Client_i.cpp2
-rw-r--r--TAO/examples/Simple/time/client.cpp2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.h2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.cpp2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.h2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.h2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/utils.h1
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Manager.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/TestClient.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/TestServer.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp1
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/media_timer.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_CORBA.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_Replica.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp1
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp1
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc1
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl1
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc1
-rw-r--r--TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp2
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_client.inl1
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_i.cpp1
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_i.h2
-rw-r--r--TAO/performance-tests/POA/Demux/write_names.cpp1
-rw-r--r--TAO/tao/AnyTypeCode/AnyTypeCode.mpc2
-rw-r--r--TAO/tao/AnyTypeCode/Marshal.inl2
-rw-r--r--TAO/tao/Array_VarOut_T.inl2
-rw-r--r--TAO/tao/Base_Transport_Property.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc1
-rw-r--r--TAO/tao/CSD_Framework/CSD_Framework.mpc1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc2
-rw-r--r--TAO/tao/CodecFactory/CodecFactory.mpc1
-rw-r--r--TAO/tao/Codeset/Codeset.mpc1
-rw-r--r--TAO/tao/Compression/Compression.mpc1
-rw-r--r--TAO/tao/Compression/bzip2/Bzip2Compressor.mpc2
-rw-r--r--TAO/tao/Compression/lzo/LzoCompressor.mpc2
-rw-r--r--TAO/tao/Compression/rle/RLECompressor.mpc2
-rw-r--r--TAO/tao/Compression/zlib/ZlibCompressor.mpc2
-rw-r--r--TAO/tao/Condition.inl2
-rw-r--r--TAO/tao/Connection_Handler.inl2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServPolicy.mpc1
-rw-r--r--TAO/tao/DynamicAny/DynamicAny.mpc1
-rw-r--r--TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp1
-rw-r--r--TAO/tao/DynamicInterface/DynamicInterface.mpc2
-rw-r--r--TAO/tao/Dynamic_TP/Dynamic_TP.mpc2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy.mpc1
-rw-r--r--TAO/tao/Fault_Tolerance_Service.inl2
-rw-r--r--TAO/tao/FoxResource/FoxResource_Factory.cpp2
-rw-r--r--TAO/tao/FoxResource/FoxResource_Loader.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_Impl.inl2
-rw-r--r--TAO/tao/GIOP_Message_Locate_Header.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Locate_Header.inl2
-rw-r--r--TAO/tao/GIOP_Message_State.inl2
-rw-r--r--TAO/tao/GIOP_Message_Version.inl2
-rw-r--r--TAO/tao/GUIResource_Factory.cpp1
-rw-r--r--TAO/tao/IFR_Client/IFR_Client.mpc1
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor.mpc1
-rw-r--r--TAO/tao/IORManipulation/IORManipulation.mpc2
-rw-r--r--TAO/tao/IORTable/Async_IORTable.mpc1
-rw-r--r--TAO/tao/IORTable/IORTable.mpc1
-rw-r--r--TAO/tao/ImR_Client/ImR_Client.mpc2
-rw-r--r--TAO/tao/Incoming_Message_Queue.inl2
-rw-r--r--TAO/tao/Incoming_Message_Stack.inl2
-rw-r--r--TAO/tao/Invocation_Endpoint_Selectors.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging.mpc1
-rw-r--r--TAO/tao/Monitor/Monitor.mpc1
-rw-r--r--TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc1
-rw-r--r--TAO/tao/PI/PI.mpc1
-rw-r--r--TAO/tao/PI_Server/PI_Server.mpc1
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.cpp2
-rw-r--r--TAO/tao/Pluggable_Messaging_Utils.inl2
-rw-r--r--TAO/tao/PolicyFactory_Registry_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer.mpc1
-rw-r--r--TAO/tao/QtResource/QtResource_Factory.cpp2
-rw-r--r--TAO/tao/QtResource/QtResource_Loader.cpp2
-rw-r--r--TAO/tao/Queued_Data.inl2
-rw-r--r--TAO/tao/RTCORBA/RTCORBA.mpc1
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer.mpc1
-rw-r--r--TAO/tao/RTScheduling/Distributable_Thread.cpp2
-rw-r--r--TAO/tao/RTScheduling/Distributable_Thread.h2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler.mpc1
-rw-r--r--TAO/tao/RTScheduling/Request_Interceptor.cpp2
-rw-r--r--TAO/tao/RTScheduling/Request_Interceptor.h2
-rw-r--r--TAO/tao/RTScheduling/ThreadAction.h1
-rw-r--r--TAO/tao/Remote_Invocation.cpp2
-rw-r--r--TAO/tao/Resume_Handle.inl2
-rw-r--r--TAO/tao/Seq_Out_T.inl2
-rw-r--r--TAO/tao/SmartProxies/SmartProxies.mpc2
-rw-r--r--TAO/tao/Strategies/Strategies.mpc1
-rw-r--r--TAO/tao/Thread_Per_Connection_Handler.cpp1
-rw-r--r--TAO/tao/TkResource/TkResource_Factory.cpp2
-rw-r--r--TAO/tao/TransportCurrent/TC.mpc1
-rw-r--r--TAO/tao/TransportCurrent/TC_IIOP.mpc1
-rw-r--r--TAO/tao/Transport_Cache_Manager_T.cpp1
-rw-r--r--TAO/tao/Transport_Cache_Manager_T.inl2
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.inl2
-rw-r--r--TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc1
-rw-r--r--TAO/tao/Valuetype/Valuetype.mpc1
-rw-r--r--TAO/tao/Wait_Strategy.inl2
-rw-r--r--TAO/tao/XtResource/XtResource_Factory.cpp2
-rw-r--r--TAO/tao/XtResource/XtResource_Loader.cpp1
-rw-r--r--TAO/tao/ZIOP/ZIOP.mpc1
-rw-r--r--TAO/tao/operation_details.cpp2
-rw-r--r--TAO/tao/operation_details.inl2
-rw-r--r--TAO/tao/target_specification.cpp2
-rw-r--r--TAO/tao/target_specification.inl2
-rw-r--r--TAO/tests/Big_Reply/Big_Reply_i.cpp1
-rw-r--r--TAO/tests/Big_Reply/Test.idl1
-rw-r--r--TAO/tests/Bug_2084_Regression/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Bug_2241_Regression/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/source.cpp2
-rw-r--r--TAO/tests/Bug_2935_Regression/source_i.cpp1
-rw-r--r--TAO/tests/Bug_3276_Regression/Manager.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/Manager.h2
-rw-r--r--TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/client.cpp2
-rw-r--r--TAO/tests/COIOP/COIOP_Simple_Test.cpp1
-rw-r--r--TAO/tests/COIOP/COIOP_Test.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc1
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_DerivedIF/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_Forwarding/test.idl2
-rw-r--r--TAO/tests/Collocated_NoColl/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocation_Tests/Collocated_Test.cpp1
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h2
-rw-r--r--TAO/tests/Exposed_Policies/Counter.idl2
-rw-r--r--TAO/tests/Exposed_Policies/Counter_i.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/RT_Properties.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/server.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/Test.idl1
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp.idl2
-rw-r--r--TAO/tests/InterOp-Naming/INS.idl2
-rw-r--r--TAO/tests/InterOp-Naming/Server_i.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/Manager.cpp1
-rw-r--r--TAO/tests/MProfile_Forwarding/Manager.h1
-rw-r--r--TAO/tests/Multiple/Multiple_Impl.cpp2
-rw-r--r--TAO/tests/OBV/Any/Any.idl2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp1
-rw-r--r--TAO/tests/OBV/Simple/Client_i.cpp2
-rw-r--r--TAO/tests/OBV/Simple/client.cpp2
-rw-r--r--TAO/tests/Objref_Sequence_Test/Test.idl1
-rw-r--r--TAO/tests/Objref_Sequence_Test/client.cpp1
-rw-r--r--TAO/tests/Objref_Sequence_Test/server.cpp1
-rw-r--r--TAO/tests/POA/DSI/POA_DSI.mpc1
-rw-r--r--TAO/tests/POA/NewPOA/POA_NewPOA.mpc1
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp1
-rw-r--r--TAO/tests/RTScheduling/Current/Thread_Task.h1
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h1
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/test.cpp1
-rw-r--r--TAO/tests/RTScheduling/Scheduler.cpp2
-rw-r--r--TAO/tests/RTScheduling/Scheduler.h1
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl1
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp1
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h1
-rw-r--r--TAO/tests/RTScheduling/VoidData/test.h2
-rw-r--r--TAO/tests/RTScheduling/VoidData/test.idl1
-rw-r--r--TAO/tests/RTScheduling/VoidData/test_client.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/dtor/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/dtor/dtor.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/dtor/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/dtor/test.idl2
-rw-r--r--TAO/tests/Xt_Stopwatch/timer.cpp1
389 files changed, 5 insertions, 639 deletions
diff --git a/ACE/ACEXML/common/AttributesImpl.inl b/ACE/ACEXML/common/AttributesImpl.inl
index 75fc288950d..78f47317e25 100644
--- a/ACE/ACEXML/common/AttributesImpl.inl
+++ b/ACE/ACEXML/common/AttributesImpl.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
diff --git a/ACE/ace/Abstract_Timer_Queue.cpp b/ACE/ace/Abstract_Timer_Queue.cpp
index 61843eda154..021c637fe6e 100644
--- a/ACE/ace/Abstract_Timer_Queue.cpp
+++ b/ACE/ace/Abstract_Timer_Queue.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_ABSTRACT_TIMER_QUEUE_CPP
#define ACE_ABSTRACT_TIMER_QUEUE_CPP
#include "ace/config-all.h"
diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h
index 9ef249386c8..d8460d5bf56 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_ABSTRACT_TIMER_QUEUE_H
#define ACE_ABSTRACT_TIMER_QUEUE_H
diff --git a/ACE/ace/Cache_Map_Manager_T.inl b/ACE/ace/Cache_Map_Manager_T.inl
index a4a94f7ee24..dc2a42ef0f5 100644
--- a/ACE/ace/Cache_Map_Manager_T.inl
+++ b/ACE/ace/Cache_Map_Manager_T.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 2ccb2ac090b..7af66260693 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP
#define ACE_CACHED_CONNECT_STRATEGY_T_CPP
diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp
index 8674548cb31..9db1902e735 100644
--- a/ACE/ace/Caching_Strategies_T.cpp
+++ b/ACE/ace/Caching_Strategies_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_CACHING_STRATEGIES_T_CPP
#define ACE_CACHING_STRATEGIES_T_CPP
diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl
index 5e25e387aa8..dd9c9851326 100644
--- a/ACE/ace/Caching_Strategies_T.inl
+++ b/ACE/ace/Caching_Strategies_T.inl
@@ -1,7 +1,5 @@
// -*-C++-*-
//
-//$Id$
-
//////////////////////////////////////////////////////////////////////////////////
#include "ace/OS_Memory.h"
diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp
index 2bc7bd6fe53..53cf0b876ac 100644
--- a/ACE/ace/Cleanup_Strategies_T.cpp
+++ b/ACE/ace/Cleanup_Strategies_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_CLEANUP_STRATEGIES_T_CPP
#define ACE_CLEANUP_STRATEGIES_T_CPP
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
index 6b8681ffcdc..200e2e47248 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_EVENT_HANDLER_HANDLE_TIMEOUT_UPCALL_H
#define ACE_EVENT_HANDLER_HANDLE_TIMEOUT_UPCALL_H
diff --git a/ACE/ace/Hashable.cpp b/ACE/ace/Hashable.cpp
index 60f4ae35bc9..547a3065f64 100644
--- a/ACE/ace/Hashable.cpp
+++ b/ACE/ace/Hashable.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Hashable.h"
#if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/Notification_Strategy.inl b/ACE/ace/Notification_Strategy.inl
index 47479030ab6..f1c1598d0b4 100644
--- a/ACE/ace/Notification_Strategy.inl
+++ b/ACE/ace/Notification_Strategy.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_Event_Handler *
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
index 4202bc4cf56..ce602960591 100644
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ b/ACE/ace/QtReactor/QtReactor.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/QtReactor/QtReactor.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Recyclable.cpp b/ACE/ace/Recyclable.cpp
index 70cb3d95c9d..d42aea8a4f4 100644
--- a/ACE/ace/Recyclable.cpp
+++ b/ACE/ace/Recyclable.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "ace/Recyclable.h"
diff --git a/ACE/ace/Recyclable.inl b/ACE/ace/Recyclable.inl
index ef096ff62be..7a7e3fda268 100644
--- a/ACE/ace/Recyclable.inl
+++ b/ACE/ace/Recyclable.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE ACE_Recyclable_State
diff --git a/ACE/ace/Refcountable_T.inl b/ACE/ace/Refcountable_T.inl
index fe0d39bfecf..7a901476d9a 100644
--- a/ACE/ace/Refcountable_T.inl
+++ b/ACE/ace/Refcountable_T.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
template <class ACE_LOCK>
diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp
index b50e7452ba5..29a8547ae96 100644
--- a/ACE/ace/Timer_Queue_Iterator.cpp
+++ b/ACE/ace/Timer_Queue_Iterator.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_TIMER_QUEUE_ITERATOR_CPP
#define ACE_TIMER_QUEUE_ITERATOR_CPP
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index b852df5f06e..14f5676d0e5 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ACE_TIMER_QUEUE_ITERATOR_H
#define ACE_TIMER_QUEUE_ITERATOR_H
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 1c3811e5fc2..b8206531e03 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/UUID.h"
#include "ace/Guard_T.h"
diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl
index d4167a74642..a497da64667 100644
--- a/ACE/ace/UUID.inl
+++ b/ACE/ace/UUID.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
namespace ACE_Utils
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index fde4674fa79..316dcb26333 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -1,6 +1,4 @@
//-*- C++ -*-
-//$Id$
-
// The following configuration file contains defines for Borland compilers.
#ifndef ACE_CONFIG_WIN32_BORLAND_H
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index ab9bfc60431..e78fadaa262 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -30,4 +30,9 @@ BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n//smg;
BEGIN{undef $/;} s/\/\/ \$Id\$\n\n//smg;
# Replace a one line c-style id tag with nothing
BEGIN{undef $/;} s/\/\/ \$Id\$\n//smg;
+# Replace a one line c-style id tag with an empty line below that with nothing
+BEGIN{undef $/;} s/\/\/\$Id\$\n\n//smg;
+# Replace a one line c-style id tag with nothing
+BEGIN{undef $/;} s/\/\/\$Id\$\n//smg;
+
diff --git a/CIAO/ciao/Valuetype_Factories/Factories.mpc b/CIAO/ciao/Valuetype_Factories/Factories.mpc
index af80c58ca20..ed2966099b4 100644
--- a/CIAO/ciao/Valuetype_Factories/Factories.mpc
+++ b/CIAO/ciao/Valuetype_Factories/Factories.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(CCM_Cookie_Factory) : install, ccm_stub, ciao_lib {
dynamicflags += COOKIE_FACTORY_BUILD_DLL
Source_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
index 2b4a6bf5194..ca811ce932a 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DDS_SUB_IDL
#define DDS_SUB_IDL
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
index e7de0623ff4..28225040991 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef COLLACATED_CONNECTOR_
#define COLLACATED_CONNECTOR_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
index 44d1db39e96..b2dd688bb25 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DEADLINE_QOS_TEST_H_
#define DEADLINE_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
index ca6b7b42f9c..941a0fcbf81 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DEST_ORDER_QOS_TEST_H_
#define DEST_ORDER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
index 114c81f824a..ee6daf56d75 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DP_FACTORY_QOS_TEST_H_
#define DP_FACTORY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
index 7d6f4779f0f..e18a64c6481 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DOMAINPARTICIPANT_QOS_TEST_H_
#define DOMAINPARTICIPANT_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
index 15fb237e1a4..07d6aa9b9b2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DURABILITY_QOS_TEST_H_
#define DURABILITY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
index b57191c3a70..5fde21bca60 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DURABILITY_SERVICE_QOS_TEST_H_
#define DURABILITY_SERVICE_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
index 83d0483c909..a7d652b93c7 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "duration.h"
Duration::Duration ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
index b33dc679ac7..abf2962c1a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/duration.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DURATION_H_
#define DURATION_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
index 9425f40fbd7..5776a879e7e 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef HISTORY_QOS_TEST_H_
#define HISTORY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
index b4aa84f5848..968011fc581 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef LATENCY_BUDGET_QOS_TEST_H_
#define LATENCY_BUDGET_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
index cfafa038131..0977e58ccdc 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef LIFESPAN_QOS_TEST_H_
#define LIFESPAN_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
index b62b22150be..7fea05b6670 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef LIVELINESS_QOS_TEST_H_
#define LIVELINESS_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
index 9912b6f1eee..a3399da99d1 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "octet_seq.h"
OctetSequence::OctetSequence ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
index 0b9c1abe0f7..f17bf8e0aab 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef OCTET_SEQ_H_
#define OCTET_SEQ_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
index c1c5ae57034..f1deb5aa63f 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef OWNERSHIP_QOS_TEST_H_
#define OWNERSHIP_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
index c4680b396e9..fe46ea19f39 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_
#define OWNERSHIP_STRENGTH_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
index 286e23dd92d..329348a6d72 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef PARTITION_QOS_TEST_H_
#define PARTITION_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
index 0358925fbff..6acfd5da5b2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef PRESENTATION_QOS_TEST_H_
#define PRESENTATION_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
index a0c5d685381..6eff701402b 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_
#define READER_DATA_LIFECYCLE_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
index f4116698f2f..45887016444 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef RELIABILITY_QOS_TEST_H_
#define RELIABILITY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
index 9d57f139d54..51d1bf84240 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef RESOURCE_LIMITS_QOS_TEST_H_
#define RESOURCE_LIMITS_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
index ed5a339f3e3..78aeaad0098 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "string_seq.h"
StringSequence::StringSequence ()
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
index 84840d8753d..17d7e9419a2 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/string_seq.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef STRING_SEQ_H_
#define STRING_SEQ_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
index c67c9593aad..832aa73a055 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TIME_BASED_FILTER_QOS_TEST_H_
#define TIME_BASED_FILTER_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
index 373086ac034..94707413a0a 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TOPIC_DATA_QOS_TEST_H_
#define TOPIC_DATA_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
index dd94d6d65bb..fdc5ccf6155 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TRANSPORT_PRIORITY_QOS_TEST_H_
#define TRANSPORT_PRIORITY_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
index e9db0f811d4..ba06c6420cd 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/typeconsistencyenforcement_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
#define TYPECONSISTENCYENFORCEMENT_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
index e6848e25e66..e0ce81b4159 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef USER_DATA_QOS_TEST_H_
#define USER_DATA_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
index e8694e3c3c1..05536fc3dcd 100644
--- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
+++ b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_
#define WRITER_DATA_LIFECYCLE_QOS_TEST_H_
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
index 56ac8f1daa2..fe3281faba3 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file SenderDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
index a89be8e0002..e60e2bb678c 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file SenderDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
index 7189a56c2e8..a73c5ac6764 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file ReceiverDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
index 188954c8b23..3002014b755 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file SenderDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
index 9f0535437c9..de62aa77ca1 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file ReceiverDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
index 69163d68adf..b55e57cb764 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file SenderDriver.cpp
*
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
index cb44c82cdca..a1af31c4139 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SHAPES_DEFN_IDL_
#define SHAPES_DEFN_IDL_
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
index cf020aeab1a..b68180f8847 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef BMCLOSEDED_IDL
#define BMCLOSEDED_IDL
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice.idl b/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
index ef2e39caa38..ae7a2ddd430 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice.idl
@@ -1,4 +1,3 @@
-//$Id$
//=============================================================================
/**
* @file BMDevice.idl
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
index 1bcf144de33..84426657b89 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef BMDISPLAY_IDL
#define BMDISPLAY_IDL
diff --git a/CIAO/examples/Hello_Event/Sender/Sender.idl b/CIAO/examples/Hello_Event/Sender/Sender.idl
index edf43943bfc..22ec7c31a23 100644
--- a/CIAO/examples/Hello_Event/Sender/Sender.idl
+++ b/CIAO/examples/Hello_Event/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SENDER_IDL
#define SENDER_IDL
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
index 1e486f79595..f333d77cecd 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TSEC_CHECKPOINT_IDL
#define TSEC_CHECKPOINT_IDL
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 0745726bd2f..2659a2d202d 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(TSEC_CheckPoint_idl_gen) : componentidldefaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
index 8f2b0c02d3d..1ea3a4050c8 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
//-------------------------------------------------------------------
// Includes
//-------------------------------------------------------------------
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
index 7f09543ea32..c3c67a7152f 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
@@ -1,5 +1,3 @@
-//$Id$
-
//===================================================================
/**
* @file TSEC_CheckPoint_exec.h
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
index 8901cdbf20a..b4b084c2a16 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
/**
* @file controller.cpp
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
index 64f3458084c..a194b076455 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef ENW_IDL
#define ENW_IDL
diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
index 0c5f08c1101..f505a3936e4 100644
--- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(ENW_stub): ccm_stub, avoids_ccm_noevent {
sharedname = ENW_stub
idlflags -= -GT
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
index 239fb03eefe..7ef82b0ba4e 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.idl
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Basic.idl"
module Basic
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
index cfde3670c43..d8fa2858142 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Tester.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file Tester.cpp
*
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
index 71a1bc8cd45..0dd828392ba 100644
--- a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file Tester.cpp
*
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
index 239fb03eefe..7ef82b0ba4e 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Basic.idl"
module Basic
diff --git a/CIAO/tests/Minimum/Sender/Sender.idl b/CIAO/tests/Minimum/Sender/Sender.idl
index dc1548f5394..cfba67809a3 100644
--- a/CIAO/tests/Minimum/Sender/Sender.idl
+++ b/CIAO/tests/Minimum/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef CIAO_SENDER_IDL
#define CIAO_SENDER_IDL
diff --git a/CIAO/tests/TTSCTest/Sender/Sender.idl b/CIAO/tests/TTSCTest/Sender/Sender.idl
index ce464755c58..a1ba57fe560 100644
--- a/CIAO/tests/TTSCTest/Sender/Sender.idl
+++ b/CIAO/tests/TTSCTest/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SENDER_IDL
#define SENDER_IDL
diff --git a/CIAO/tests/TTSConnContext/Sender/Sender.idl b/CIAO/tests/TTSConnContext/Sender/Sender.idl
index ce464755c58..a1ba57fe560 100644
--- a/CIAO/tests/TTSConnContext/Sender/Sender.idl
+++ b/CIAO/tests/TTSConnContext/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SENDER_IDL
#define SENDER_IDL
diff --git a/CIAO/tests/Thread/Sender/Sender.idl b/CIAO/tests/Thread/Sender/Sender.idl
index 95f21a846e6..6315a7afff9 100644
--- a/CIAO/tests/Thread/Sender/Sender.idl
+++ b/CIAO/tests/Thread/Sender/Sender.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SENDER_IDL
#define SENDER_IDL
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
index 24b23230d84..81afd2a5d0c 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef STOCKBROKER_IDL
#define STOCKBROKER_IDL
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp b/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
index 503271abe90..756bda55453 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file StockBrokerDriver.cpp
*
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
index 0f50b39b57b..68fce4853e6 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef STOCKDISTRIBUTOR_IDL
#define STOCKDISTRIBUTOR_IDL
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
index 6a070280425..d7bf054ebc5 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* @file StockDistributorDriver.cpp
*
diff --git a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
index 7f33f445254..761d8778287 100644
--- a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
+++ b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef STOCK_BASE_IDL
#define STOCK_BASE_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_Base.idl b/DAnCE/dance/Deployment/Deployment_Base.idl
index 91ad3722919..6e8e4394d74 100644
--- a/DAnCE/dance/Deployment/Deployment_Base.idl
+++ b/DAnCE/dance/Deployment/Deployment_Base.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DEPLOYMENT_BASE_IDL
#define DEPLOYMENT_BASE_IDL
diff --git a/DAnCE/dance/Deployment/Deployment_TargetData.idl b/DAnCE/dance/Deployment/Deployment_TargetData.idl
index ca8060ce195..7dd199e0f00 100644
--- a/DAnCE/dance/Deployment/Deployment_TargetData.idl
+++ b/DAnCE/dance/Deployment/Deployment_TargetData.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DEPLOYMENT_TARGETDATA_IDL
#define DEPLOYMENT_TARGETDATA_IDL
diff --git a/DAnCE/tests/Config_Handlers/Config_Handlers.mpc b/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
index 487183e9ff3..a0650f631f0 100644
--- a/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
+++ b/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project (XSC_Config_Handlers_Tests) : dance_deployment_stub, dance_config_handlers, ifr_client {
requires += dummy_label
includes += $(DANCE_ROOT)/Config_Handlers
diff --git a/DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl b/DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl
index 3ee6d15e4ef..3ed4bb71217 100644
--- a/DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl
+++ b/DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl
@@ -1,4 +1,3 @@
-//$Id$
module dynany_test
{
typedef sequence<double> DoubleSequence;
diff --git a/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 01695933f49..5b4b43245b2 100644
--- a/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ComponentPropertyDescription_Handler.h"
#include "DataType_Handler.h"
#include "dance/Deployment/Deployment_DataC.h"
diff --git a/DAnCE/tools/Config_Handlers/Config_Handlers.mpc b/DAnCE/tools/Config_Handlers/Config_Handlers.mpc
index 772430a9796..3ddf025555a 100644
--- a/DAnCE/tools/Config_Handlers/Config_Handlers.mpc
+++ b/DAnCE/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project (XSC_XML_Generation) : install, xscdefaults {
requires += xsc
diff --git a/DAnCE/tools/Config_Handlers/DataType_Handler.cpp b/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
index 10cea11ff07..4d555e4defb 100644
--- a/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DataType_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "DataType_Handler.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
index 594670b3c61..0421ee01ae7 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "DataType_Handler.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/DAnCE/tools/Config_Handlers/Property_Handler.cpp b/DAnCE/tools/Config_Handlers/Property_Handler.cpp
index ef397139183..1c26a198d7a 100644
--- a/DAnCE/tools/Config_Handlers/Property_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/Property_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Property_Handler.h"
#include "Any_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 029c39c3e92..a7096033742 100644
--- a/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "SatisfierProperty_Handler.h"
#include "Any_Handler.h"
#include "Basic_Deployment_Data.hpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index ccb80dbecf4..7416d7d45f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -1,5 +1,4 @@
//
-//$Id$
//
#include "interface.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 66dd7848174..9e969f284cc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "EDF_Scheduler.h"
#include "Kokyu_qosC.h"
#include "utils.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index 7773efb70e5..9e66919b894 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef EDF_SCHEDULER_H
#define EDF_SCHEDULER_H
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 5d68d0a216a..90e2bf12b08 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "FP_Scheduler.h"
#include "Kokyu_qosC.h"
#include "utils.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index bacc9307936..173ad5460a1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef FIXED_PRIORITY_SCHEDULER_H
#define FIXED_PRIORITY_SCHEDULER_H
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
index 3419c79c058..18d2122ea4e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
@@ -1,5 +1,3 @@
-//$Id$
-
/**
* @file FP_Scheduling.idl
*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index e6a62ac3830..a729100171d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "MIF_Scheduler.h"
#include "Kokyu_qosC.h"
#include "utils.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index 414202505e3..4989577cd04 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef MIF_SCHEDULER_H
#define MIF_SCHEDULER_H
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
index c45b7f932b0..8352ffb83cf 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
@@ -1,5 +1,3 @@
-//$Id$
-
/**
* @file MIF_Scheduling.idl
*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 61af766408f..02c9e4ffb27 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "MUF_Scheduler.h"
#include "Kokyu_qosC.h"
#include "utils.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index 9b425358d75..48ca109ea68 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef MUF_SCHEDULER_H
#define MUF_SCHEDULER_H
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
index f39debcd2bf..ac6705bb9e6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
@@ -1,5 +1,3 @@
-//$Id$
-
/**
* @file MUF_Scheduling.idl
*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index 221cebbf5e6..e266b41624e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Task_Stats.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
index 0971502bcc0..4346661b2bb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Log_Msg.h"
ACE_INLINE int
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp b/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp
index 079e446d7e4..7f99595c069 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "utils.h"
#include "Kokyu/Kokyu.h"
#include "ace/Lock_Adapter_T.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/utils.h b/TAO/examples/Kokyu_dsrt_schedulers/utils.h
index 7abf410eb2e..3c6dba26d5d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/utils.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/utils.h
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/RTCORBA/RTCORBA.h"
#include "Kokyu_qosC.h"
#include "tao/RTScheduling/RTScheduler.h"
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index c3003334767..008cfcda06e 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Client_i.h"
#include "Event_Types_impl.h"
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
index 5eb9280095a..584df60e71e 100644
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index 725dd396fab..5514107d1ee 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Grid_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index b1dbe5e67e6..30b6490e315 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Persistent_Client.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 70ac6efdf45..98c926c63d7 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SIMPLE_UTIL_C
#define SIMPLE_UTIL_C
# include "Simple_util.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 8926318bcc1..67ebca5e150 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Activity.h"
#include "Thread_Task.h"
#include "Job_i.h"
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index e1895cb5854..948a153400b 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Builder.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 437fa06b899..7f0ac5e8ec4 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Job_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index cdf7533f0f5..b880c30d6f7 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "POA_Holder.h"
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 0c3040b97f9..4bef00b9e64 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Periodic_Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index 8f47ae3b823..d76aba08b65 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Task_Stats.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.inl b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
index d33143d59dd..aaf0f485f46 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.inl
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Log_Msg.h"
ACE_INLINE int
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index b24193a1d2c..10003b60260 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Thread_Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index f3c14d14c5c..d1ee3959cec 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "DT_Creator.h"
#include "Thread_Task.h"
#include "Task_Stats.h"
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index 588c9cea24d..0e6ca315bff 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef DT_CREATOR_H
#define DT_CREATOR_H
diff --git a/TAO/examples/RTScheduling/FP_Scheduling.idl b/TAO/examples/RTScheduling/FP_Scheduling.idl
index 8d50919a74b..3e5d128c1f5 100644
--- a/TAO/examples/RTScheduling/FP_Scheduling.idl
+++ b/TAO/examples/RTScheduling/FP_Scheduling.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/RTScheduling/RTScheduler_include.pidl"
#include "tao/RTCORBA/RTCORBA_include.pidl"
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
index 71a7d1c25d0..12fbc8127a2 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "FP_DT_Creator.h"
#include "test.h"
#include "FP_Task.h"
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
index 357ac34457f..a39bfc021d1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef FP_DT_CREATOR_H
#define FP_DT_CREATOR_H
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index ea89484736b..f4707507c05 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "FP_Scheduler.h"
#include "ace/Atomic_Op.h"
#include "tao/RTScheduling/Request_Interceptor.h"
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index 61e16e20b4c..09bb04dc53d 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef FIXED_PRIORITY_SCHEDULER_H
#define FIXED_PRIORITY_SCHEDULER_H
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index 99acc51ef2f..51b1787ddd9 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "FP_Task.h"
#include "test.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
index 8e5494f8448..65912189c78 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef FP_TASK_H
#define FP_TASK_H
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index d58f25bed4e..df9a095bf50 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "test.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
index aa7ff8dfb65..59616b7a4fb 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef TEST_H
#define TEST_H
#include /**/ "ace/pre.h"
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 8a6cc6d40d7..b2a518cb81e 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Job_i.h"
#include "DT_Creator.h"
#include "Task_Stats.h"
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index 3f006bcf6bc..884f1fb2f42 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "MIF_DT_Creator.h"
#include "test.h"
#include "MIF_Task.h"
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
index 64c255f6444..f677b094f9e 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef MIF_DT_CREATOR_H
#define MIF_DT_CREATOR_H
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 439252ff276..d1a9f4b6ba2 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "MIF_Scheduler.h"
#include "ace/Atomic_Op.h"
#include "tao/RTScheduling/Request_Interceptor.h"
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index 940488711b9..ea546dc40e9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef MIF_SCHEDULER_H
#define MIF_SCHEDULER_H
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index f9ad227ec89..d60b0961c97 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "MIF_Task.h"
#include "test.h"
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
index 62ac087f5d6..5acb8995953 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef MIF_TASK_H
#define MIF_TASK_H
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 98b846b0cfb..33aae3ce537 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "test.h"
#include "../Task_Stats.h"
#include "../Synch_i.h"
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
index acb1f249fe8..18b914937ce 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef TEST_H
#define TEST_H
diff --git a/TAO/examples/RTScheduling/MIF_Scheduling.idl b/TAO/examples/RTScheduling/MIF_Scheduling.idl
index 9d1705268c5..c7a3fbb49d9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduling.idl
+++ b/TAO/examples/RTScheduling/MIF_Scheduling.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/RTScheduling/RTScheduler_include.pidl"
#include "tao/RTCORBA/RTCORBA_include.pidl"
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 190b5a51cfc..5049898618e 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "POA_Holder.h"
#include "tao/debug.h"
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 751cc6e8733..8eeab3ce54a 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -1,5 +1,3 @@
-//$Id$
-
/* -*- C++ -*- */
//=============================================================================
/**
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 9344d721953..57eb4474de0 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Starter.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 757af4cae0a..49b50d41afa 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef STARTER_H
#define STARTER_H
diff --git a/TAO/examples/RTScheduling/Synch.idl b/TAO/examples/RTScheduling/Synch.idl
index 45ccc7b49c2..35132a7e761 100644
--- a/TAO/examples/RTScheduling/Synch.idl
+++ b/TAO/examples/RTScheduling/Synch.idl
@@ -1,5 +1,3 @@
-//$Id$
-
interface Synch
{
oneway void go (in long base_time);
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 9d328bef4cf..8e89b0fc637 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Synch_i.h"
Synch_i::Synch_i (void)
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index 248895d9a18..f5c6a981cde 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef SYNCH_I_H
#define SYNCH_I_H
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index 1fb7d854a50..37a0f835ef0 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Task_Stats.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/RTScheduling/Task_Stats.inl b/TAO/examples/RTScheduling/Task_Stats.inl
index 582ad61ba85..145f120f49a 100644
--- a/TAO/examples/RTScheduling/Task_Stats.inl
+++ b/TAO/examples/RTScheduling/Task_Stats.inl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Log_Msg.h"
ACE_INLINE int
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index f2847e530d5..1047365b4e0 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Thread_Task.h"
#include "DT_Creator.h"
#include "Task_Stats.h"
diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h
index 0bea6f2f01d..d1ee2633609 100644
--- a/TAO/examples/RTScheduling/Thread_Task.h
+++ b/TAO/examples/RTScheduling/Thread_Task.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef THREAD_TASK_H
#define THREAD_TASK_H
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index 144374151d6..11d6d825e94 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Bank_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index b70765c6c83..8d90bd5c998 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Echo_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Simple/echo/client.cpp b/TAO/examples/Simple/echo/client.cpp
index 41f99b1df94..d3851527028 100644
--- a/TAO/examples/Simple/echo/client.cpp
+++ b/TAO/examples/Simple/echo/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "Echo_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index 48fc1c5ebd4..7db658e5b40 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Grid_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index f5ee31efff1..eb6ee7133f6 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Time_Date_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index fab114c2385..43c46e20502 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Time_Client_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp
index c147c199653..ae493d1586e 100644
--- a/TAO/examples/Simple/time/client.cpp
+++ b/TAO/examples/Simple/time/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "Time_Client_i.h"
// The client program for the application.
diff --git a/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.h b/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.h
index 484dbba1226..dc759353d10 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//$Id$
-
#ifndef BASEVALUEFACTORY_H
#define BASEVALUEFACTORY_H
diff --git a/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.cpp b/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.cpp
index 7b75353195e..5acd1250be5 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "BaseValueImpl.h"
Demo_BaseValueImpl::Demo_BaseValueImpl()
diff --git a/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.h b/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.h
index 8e2880639fe..c3129dfd3ed 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/BaseValueImpl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//$Id$
-
#ifndef BASEVALUEIMPL_H
#define BASEVALUEIMPL_H
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
index 9c758ea81af..1eee8431332 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "NestedValueFactory.h"
#include "NestedValueImpl.h"
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.h b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.h
index a5993f0b19b..84732d2d721 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueFactory.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//$Id$
-
#ifndef NESTEDVALUEFACTORY_H
#define NESTEDVALUEFACTORY_H
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
index b7c6931ab3f..0ae211131d8 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "NestedValueImpl.h"
Demo_NestedValueImpl::Demo_NestedValueImpl (void)
diff --git a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
index 6250f2b7ea3..d84a54fdedf 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/NestedValueImpl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-//$Id$
-
#ifndef NESTEDVALUE_H
#define NESTEDVALUE_H
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
index b1246c2038f..1fb777c5287 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Utils.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "utils.h"
#include "ImplRepoC.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h
index 7bfde174184..2ee0eb7f7be 100644
--- a/TAO/orbsvcs/ImplRepo_Service/utils.h
+++ b/TAO/orbsvcs/ImplRepo_Service/utils.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef TAO_IMR_UTILS_H
#define TAO_IMR_UTILS_H
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index dc1a8b7e137..d6b47ebfb34 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Logging_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
index 9a51388965d..2be113473a0 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*IDL): taoidldefaults {
IDL_Files {
Manager.idl
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl b/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
index 3b01e2ff7e3..49106eab929 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager.idl
@@ -1,4 +1,3 @@
-//$Id$
interface Manager
{
long registerServer();
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl b/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
index 421512c8587..07edf850ee7 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Messenger.idl
@@ -1,4 +1,3 @@
-//$Id$
interface Messenger
{
long send_message(in long thread, in long iter, in long obj, in long req);
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 873f7247f16..effc8779607 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestClient.h"
#include "MessengerC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
index ad683187566..4161ef49d15 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/ORB.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index b833848d930..d81bf00deaf 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestServer.h"
#include "ManagerC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
index 666f526a014..b3e200d3786 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
@@ -1,4 +1,3 @@
-//$Id$
#include "Messenger_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
index 2990cc0b6f0..21cc54857b5 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestClient.h"
#include <ace/streams.h>
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
index 11f615ec393..a8282880ebc 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Manager_i.h"
#include <ace/Get_Opt.h>
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
index c6118e25d69..d6e50f32682 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestServer.h"
#include <ace/streams.h>
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index 2f1c2b82780..075e7306e56 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Gateway_i.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 52d41076d35..47774c8921e 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
#ifndef SERVER_IORINTERCEPTOR_H
#define SERVER_IORINTERCEPTOR_H
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 2a138f62d96..b1feb2a1270 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef TAO_AV_FLOWS_T_CPP
#define TAO_AV_FLOWS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
index 79d91842ae2..a5388d36240 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
@@ -1,4 +1,3 @@
-//$Id$
/*
* Copyright (c) 1995 Regents of the University of California.
* All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index 144c2290bbe..8aea23a1f02 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -1,4 +1,3 @@
-//$Id$
// FT.idl
#ifndef _FT_IDL_
#define _FT_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
index 6503eb969a5..60d346ec8a5 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA_ORB.idl
@@ -1,4 +1,3 @@
-//$Id$
#ifndef TAO_FT_CORBA_ORB_IDL
#define TAO_FT_CORBA_ORB_IDL
diff --git a/TAO/orbsvcs/orbsvcs/FT_Replica.idl b/TAO/orbsvcs/orbsvcs/FT_Replica.idl
index eb351729e6e..1048b513515 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Replica.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_Replica.idl
@@ -1,4 +1,3 @@
-//$Id$
// FT_replica.idl
#ifndef _FT_REPLICA_IDL_
#define _FT_REPLICA_IDL_
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index c0b366020ae..a71f1d99935 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
index 1fc06596f71..1f7bdb40107 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
index 5e3a8417714..2c4dfc673ce 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index b7d45633400..75e3b09891d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
index 15006251244..4d0c634a2a0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index e0db83257a5..56f1375fc9b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/Utils/Log.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 0a67dc6a12d..8e717c86814 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "orbsvcs/FtRtEvent/Utils/UUID.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 9f8ecb8fced..9e327e5fcc5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index e1629d6a0b5..3cdc82216da 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -2,8 +2,6 @@
/**
* @file DynSched.cpp
*
- * $Id$
- *
* @author Chris Gill
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index b93aa99c58b..d5b383829f8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -4,8 +4,6 @@
/**
* @file DynSched.h
*
- * $Id$
- *
* @author Chris Gill
*/
//=============================================================================
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 4e43658781e..e04a1d22fcd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Connection_Manager.h"
Connection_Manager::Connection_Manager (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index e19477d0dc4..c3639d2f62e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Connection_Manager.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index c8b003d22a4..37148f5d58f 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TimeModuleS.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
index e4d8195ffbd..f5aef167ac0 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc b/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
index f78ee0c0f12..8a5ec6c6366 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/Timeout.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*Timeout): orbsvcsexe, naming, event, event_skel, messaging, threads {
exename = TimeoutTest
}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
index f154942bbb7..b76d4929a3a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
@@ -1,5 +1,4 @@
// -*- IDL -*-
-//$Id$
#include "tao/PortableInterceptor.pidl"
#include "tao/PI_Server/PI_Server_include.pidl"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index a70dbe81524..90958d5b065 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Manager.h"
#include "Client_i.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
index 1e949a91aa5..0835d37f395 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h
@@ -1,4 +1,3 @@
-//$Id$
// -*- C++ -*-
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
index 1e949a91aa5..0835d37f395 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h
@@ -1,4 +1,3 @@
-//$Id$
// -*- C++ -*-
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index bb111e54370..56a3172182b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 779bde188e6..6dfcd5110ac 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
index 3c680ff8717..e4629650d00 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 904a3a3a3f5..94410f0448c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 2de58de6f29..246a7d81f20 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 1db133780ce..e65237bdb92 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index c27af8a8979..ddd0ad8f9ac 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index cb23b49b2b2..a3326305bcb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index d46024acacc..65dc9125add 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "../lib/Notify_Test_Client.h"
#include "orbsvcs/NotifyExtC.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 4c02db89fee..94f5b14a568 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "../lib/Driver.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
index e8ac5a5b9dc..62f08c874bb 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-//$Id$
-
#ifndef TEST_TOPOLOGY_FACTORY_H
#define TEST_TOPOLOGY_FACTORY_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index a8c48427f85..7bc87083d6d 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Consumer.h"
#include "tao/debug.h"
#include "tao/PortableServer/PortableServerC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 83a78e4a669..8df27bf97d5 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Supplier.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
index aa20cd8a7d3..89e9ca09e88 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Task_Callback.h"
TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index c9d1ee9c57b..89ee2135cd5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Task_Stats.h"
#include "ace/ACE.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index ba9526204cd..d75072465e6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/High_Res_Timer.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
index 2aa30d6a187..01df3bcab47 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
@@ -1,4 +1,3 @@
-//$Id$
project : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
sharedname = CSD_PT_TestInf
dynamicflags += CSD_PT_TESTINF_BUILD_DLL
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
index 6583cf2f6fe..3e0062d34c5 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
@@ -1,4 +1,3 @@
-//$Id$
project : csd_pt_testinf_lib, avoids_corba_e_micro {
sharedname = CSD_PT_TestServant
dynamicflags += CSD_PT_TESTSERVANT_BUILD_DLL
diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
index 3422eb6644b..1b52a033215 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl
index 9c1a895f20b..9b2d1111852 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.inl
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl
@@ -1,4 +1,3 @@
-//$Id$
static void M302 (Demux_Test_ptr objref)
{
objref->M302 ();
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index 5f95b402308..eb44ad3b68a 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
// Implementation of TAO's Demux_Test interface
#include "demux_test_i.h"
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index b4dd1e68888..505e86ef220 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -1,5 +1,3 @@
-//$Id$
-
#if !defined (TAO_DEMUX_TEST_I_H)
#define TAO_DEMUX_TEST_I_H
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
index 72ddf8f1cf4..73002c74770 100644
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ b/TAO/performance-tests/POA/Demux/write_names.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include <ace/OS_NS_stdio.h>
int
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
index b332f045b08..aab09a00a2f 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
custom_only = 1
idlflags += -Gp -Gd -Sci -SS -GA \
diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl
index cb1fb80d2c4..281a0225f2f 100644
--- a/TAO/tao/AnyTypeCode/Marshal.inl
+++ b/TAO/tao/AnyTypeCode/Marshal.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index 85b5aa7532d..a3ab61af4b8 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T, typename T_slice, typename TAG>
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 01754449b5a..4a4f834c157 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/Base_Transport_Property.h"
#include "ace/OS_Memory.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
index f1c6a688be0..c6b65aac932 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc
index ab92c149e34..e79c866a5f1 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework.mpc
+++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
index cc5c7336604..e847137d0ee 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(CSD_ThreadPool) : csd_framework, tao_output, install, threads {
sharedname = TAO_CSD_ThreadPool
dynamicflags += TAO_CSD_TP_BUILD_DLL
diff --git a/TAO/tao/CodecFactory/CodecFactory.mpc b/TAO/tao/CodecFactory/CodecFactory.mpc
index cbda75b62d4..09c20ed30bc 100644
--- a/TAO/tao/CodecFactory/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory/CodecFactory.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Codeset/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc
index 0f0936fe8fb..53edba39202 100644
--- a/TAO/tao/Codeset/Codeset.mpc
+++ b/TAO/tao/Codeset/Codeset.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
idlflags += -SS -Sci -Sorb \
diff --git a/TAO/tao/Compression/Compression.mpc b/TAO/tao/Compression/Compression.mpc
index df3b9098c3f..928f06a9f91 100644
--- a/TAO/tao/Compression/Compression.mpc
+++ b/TAO/tao/Compression/Compression.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
idlflags += -SS -Sorb -Sci -GA \
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
index 37d8e57d15e..ace59637cc5 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(Bzip2Compressor) : taolib, tao_output, install, compression, taoidldefaults, ace_bzip2 {
requires += bzip2
sharedname = TAO_Bzip2Compressor
diff --git a/TAO/tao/Compression/lzo/LzoCompressor.mpc b/TAO/tao/Compression/lzo/LzoCompressor.mpc
index dff84ee46ff..66311f6e6e7 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor.mpc
+++ b/TAO/tao/Compression/lzo/LzoCompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(LzoCompressor) : taolib, tao_output, install, compression, taoidldefaults, lzo1 {
requires += lzo1
sharedname = TAO_LzoCompressor
diff --git a/TAO/tao/Compression/rle/RLECompressor.mpc b/TAO/tao/Compression/rle/RLECompressor.mpc
index 784f6c35eff..d17adf9901b 100644
--- a/TAO/tao/Compression/rle/RLECompressor.mpc
+++ b/TAO/tao/Compression/rle/RLECompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(RLECompressor) : ace_rlecompressionlib, taolib, tao_output, install, compression, taoidldefaults {
sharedname = TAO_RLECompressor
dynamicflags += TAO_RLECOMPRESSOR_BUILD_DLL
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.mpc b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
index abf165babdd..a8dad50d86a 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.mpc
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(ZlibCompressor) : taolib, tao_output, install, compression, taoidldefaults, ace_zlib {
requires += zlib
sharedname = TAO_ZlibCompressor
diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl
index 0e69d8b1bf1..c51494ec098 100644
--- a/TAO/tao/Condition.inl
+++ b/TAO/tao/Condition.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template <class MUTEX> ACE_INLINE int
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 75ad2dbf6c0..a6c8dc8b242 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
#include "tao/Transport.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
index 27e08e239c8..0894056e55d 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, tao_no_iiop, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc
index e0582ec7226..5ab00b1a288 100644
--- a/TAO/tao/DynamicAny/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny/DynamicAny.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, valuetype, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index ef0170fa16c..4de7ddaa17a 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
diff --git a/TAO/tao/DynamicInterface/DynamicInterface.mpc b/TAO/tao/DynamicInterface/DynamicInterface.mpc
index 823176ca877..c4435f73867 100644
--- a/TAO/tao/DynamicInterface/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface/DynamicInterface.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(DynamicInterface) : taolib, tao_output, install, messaging, minimum_corba {
sharedname = TAO_DynamicInterface
dynamicflags += TAO_DYNAMICINTERFACE_BUILD_DLL
diff --git a/TAO/tao/Dynamic_TP/Dynamic_TP.mpc b/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
index 764cc76884b..29303146935 100644
--- a/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
+++ b/TAO/tao/Dynamic_TP/Dynamic_TP.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(Dynamic_TP) : taolib, tao_output, install, pi, csd_framework, csd_threadpool {
sharedname = TAO_Dynamic_TP
dynamicflags += TAO_DYNAMIC_TP_BUILD_DLL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
index 297c2c36364..b20fc829e78 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Fault_Tolerance_Service.inl b/TAO/tao/Fault_Tolerance_Service.inl
index f655d681151..bc2ab62f6c2 100644
--- a/TAO/tao/Fault_Tolerance_Service.inl
+++ b/TAO/tao/Fault_Tolerance_Service.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp
index 0cca01ab3f1..c3549b3d95f 100644
--- a/TAO/tao/FoxResource/FoxResource_Factory.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/FoxResource/FoxResource_Factory.h"
#include "tao/debug.h"
#include "ace/FoxReactor/FoxReactor.h"
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.cpp b/TAO/tao/FoxResource/FoxResource_Loader.cpp
index 31be07916ba..e60dd560464 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.cpp
+++ b/TAO/tao/FoxResource/FoxResource_Loader.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/FoxResource/FoxResource_Loader.h"
#include "tao/ORB_Core.h"
#include "tao/FoxResource/FoxResource_Factory.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
index 5babb648382..22679950ba9 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE CORBA::Boolean
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
index 06da7d61ca6..09e4eb7b76a 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/GIOP_Message_Locate_Header.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl
index 8094b30c50e..9a97ae2d600 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.inl
+++ b/TAO/tao/GIOP_Message_Locate_Header.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
index 3298ee8d319..ca6e573d523 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
index 6db2e26f688..c78ee53502f 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index 33695590b87..27f7a008861 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/GUIResource_Factory.h"
#include "ace/Reactor.h"
#include "tao/debug.h"
diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
index 23619c3fcda..a9473844267 100644
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client/IFR_Client.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
idlflags += -GX \
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc
index a103ae5081b..43756dd615c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc
index 44643141187..6f2e8b2a1d4 100644
--- a/TAO/tao/IORManipulation/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation/IORManipulation.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/IORTable/Async_IORTable.mpc b/TAO/tao/IORTable/Async_IORTable.mpc
index 043295a7122..a64668873fc 100644
--- a/TAO/tao/IORTable/Async_IORTable.mpc
+++ b/TAO/tao/IORTable/Async_IORTable.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc
index a3292cb6714..9a1f0f2ec85 100644
--- a/TAO/tao/IORTable/IORTable.mpc
+++ b/TAO/tao/IORTable/IORTable.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc
index adeaf26911e..d839e33cf84 100644
--- a/TAO/tao/ImR_Client/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client/ImR_Client.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
index 484355fca1e..f9623de1742 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl
index d3420eb394f..3f785c36c71 100644
--- a/TAO/tao/Incoming_Message_Stack.inl
+++ b/TAO/tao/Incoming_Message_Stack.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/************************************************************************/
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 752860ba877..913169b2ad6 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/Invocation_Endpoint_Selectors.h"
#include "tao/Stub.h"
#include "tao/Profile.h"
diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc
index 06d2cc6ddc2..a9c2aaf2841 100644
--- a/TAO/tao/Messaging/Messaging.mpc
+++ b/TAO/tao/Messaging/Messaging.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc
index 7b8f3cb270d..4ceb503f5df 100644
--- a/TAO/tao/Monitor/Monitor.mpc
+++ b/TAO/tao/Monitor/Monitor.mpc
@@ -1,4 +1,3 @@
-//$Id$
project (*idl): tao_versioning_idl_defaults, install {
custom_only = 1
idlflags += -Gp -Gd -GA \
diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
index 8ac8d28a1d6..94113224698 100644
--- a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/PI/PI.mpc b/TAO/tao/PI/PI.mpc
index b32de399473..62b3b405000 100644
--- a/TAO/tao/PI/PI.mpc
+++ b/TAO/tao/PI/PI.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
custom_only = 1
idlflags += -SS -Sci -Gp -Gd \
diff --git a/TAO/tao/PI_Server/PI_Server.mpc b/TAO/tao/PI_Server/PI_Server.mpc
index cad94e5df51..94034614dec 100644
--- a/TAO/tao/PI_Server/PI_Server.mpc
+++ b/TAO/tao/PI_Server/PI_Server.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
custom_only = 1
idlflags += \
diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp
index e6e8a28c993..fd43f298cee 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/Pluggable_Messaging_Utils.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl
index 3af24e41ef7..2dd22a60f12 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.inl
+++ b/TAO/tao/Pluggable_Messaging_Utils.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp
index 155f82be0db..3ba55302382 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/PolicyFactory_Registry_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index b6a94a51993..572842ebe02 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Servant_Upcall.h"
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
index fec90ddd602..85b1ae474cd 100644
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ b/TAO/tao/PortableServer/PortableServer.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install, pidl_install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
index cef6c5155ee..b65474c89fa 100644
--- a/TAO/tao/QtResource/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/QtResource/QtResource_Factory.h"
#include "tao/debug.h"
#include "ace/QtReactor/QtReactor.h"
diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
index a42e670a821..284077df372 100644
--- a/TAO/tao/QtResource/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/QtResource/QtResource_Loader.h"
#include "tao/ORB_Core.h"
#include "tao/QtResource/QtResource_Factory.h"
diff --git a/TAO/tao/Queued_Data.inl b/TAO/tao/Queued_Data.inl
index 1508377fc05..c5cf403eafb 100644
--- a/TAO/tao/Queued_Data.inl
+++ b/TAO/tao/Queued_Data.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/*static*/
diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc
index b466e85f9c3..e5d52fb8488 100644
--- a/TAO/tao/RTCORBA/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA/RTCORBA.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install, pidl_install {
custom_only = 1
idlflags += -Sci -SS -Sorb -GX \
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc
index 0fed8f40069..d8d2c4761ed 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
custom_only = 1
idlflags += -Sci -SS -Sorb -GX \
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index 7d8a6a0dc1f..d9b29cfdf5c 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/RTScheduling/Distributable_Thread.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index 82800837491..3b57102d827 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-//$Id$
-
#ifndef DISTRIBUTABLE_THREAD_H
#define DISTRIBUTABLE_THREAD_H
diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc
index 530cd6fefa3..4d61ef78f1b 100644
--- a/TAO/tao/RTScheduling/RTScheduler.mpc
+++ b/TAO/tao/RTScheduling/RTScheduler.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, avoids_corba_e_micro, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 71738b887bb..37c187c7ad9 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/AnyTypeCode/Any.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 447592830bb..5eaffea8a89 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
#ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
#define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index 4c389996499..bd71b13b901 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-//$Id$
#ifndef TAO_ThreadAction_H
#define TAO_ThreadAction_H
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index 0b3e4392b4e..4e284f3da03 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/Remote_Invocation.h"
#include "tao/Profile.h"
#include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl
index 04e538f537f..bf3c8e973a2 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl
index 80e460f6cf2..2dd32fead2c 100644
--- a/TAO/tao/Seq_Out_T.inl
+++ b/TAO/tao/Seq_Out_T.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
template<typename T>
diff --git a/TAO/tao/SmartProxies/SmartProxies.mpc b/TAO/tao/SmartProxies/SmartProxies.mpc
index 6951bf47f2a..786ca9d2e3f 100644
--- a/TAO/tao/SmartProxies/SmartProxies.mpc
+++ b/TAO/tao/SmartProxies/SmartProxies.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults {
sharedname = TAO_SmartProxies
dynamicflags += TAO_SMARTPROXIES_BUILD_DLL
diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc
index 6940d823875..3d6ce6d7278 100644
--- a/TAO/tao/Strategies/Strategies.mpc
+++ b/TAO/tao/Strategies/Strategies.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp
index 342018d9b08..c665403fc14 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/Thread_Per_Connection_Handler.h"
#include "tao/Connection_Handler.h"
#include "tao/debug.h"
diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp
index b8cfe45001a..7fec8956aa6 100644
--- a/TAO/tao/TkResource/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource/TkResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/TkResource/TkResource_Factory.h"
#include "tao/debug.h"
#include "ace/TkReactor/TkReactor.h"
diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc
index 46bacb2cf03..a9c8d857db4 100644
--- a/TAO/tao/TransportCurrent/TC.mpc
+++ b/TAO/tao/TransportCurrent/TC.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : taolib_with_idl, tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc
index 2f8acb6e99e..7db3d504228 100644
--- a/TAO/tao/TransportCurrent/TC_IIOP.mpc
+++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index d02e619272a..0035cadcd2d 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/Transport_Cache_Manager_T.h"
#include "tao/debug.h"
#include "tao/Connection_Purging_Strategy.h"
diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl
index faadb1190b6..9c4e8c8ef0c 100644
--- a/TAO/tao/Transport_Cache_Manager_T.inl
+++ b/TAO/tao/Transport_Cache_Manager_T.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 4e667f946a9..53a1cf35bf1 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
index 328cef556ad..f83cdb28066 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc
index a84d2524660..ea77f5d08f0 100644
--- a/TAO/tao/Valuetype/Valuetype.mpc
+++ b/TAO/tao/Valuetype/Valuetype.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*idl) : tao_versioning_idl_defaults, gen_ostream, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/Wait_Strategy.inl b/TAO/tao/Wait_Strategy.inl
index c39b083c95e..ba6720dd49b 100644
--- a/TAO/tao/Wait_Strategy.inl
+++ b/TAO/tao/Wait_Strategy.inl
@@ -1,5 +1,3 @@
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE bool
diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp
index 17f3a88f604..637a783140a 100644
--- a/TAO/tao/XtResource/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource/XtResource_Factory.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/XtResource/XtResource_Factory.h"
#include "tao/debug.h"
#include "ace/XtReactor/XtReactor.h"
diff --git a/TAO/tao/XtResource/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp
index 2208494fe7a..95078ee11d4 100644
--- a/TAO/tao/XtResource/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource/XtResource_Loader.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/XtResource/XtResource_Loader.h"
#include "tao/ORB_Core.h"
#include "tao/XtResource/XtResource_Factory.h"
diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc
index 8eb56e3ae18..25667a5f478 100644
--- a/TAO/tao/ZIOP/ZIOP.mpc
+++ b/TAO/tao/ZIOP/ZIOP.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*core_idl) : tao_versioning_idl_defaults, install {
custom_only = 1
IDL_Files {
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 916cb7876e9..2c0bd86b0c1 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/operation_details.h"
#include "tao/Stub.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl
index cbd733b5838..e012c99347a 100644
--- a/TAO/tao/operation_details.inl
+++ b/TAO/tao/operation_details.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp
index 9efae876cf8..0e2c3fffa3c 100644
--- a/TAO/tao/target_specification.cpp
+++ b/TAO/tao/target_specification.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/target_specification.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/target_specification.inl b/TAO/tao/target_specification.inl
index dd1265bf0df..cd58417e335 100644
--- a/TAO/tao/target_specification.inl
+++ b/TAO/tao/target_specification.inl
@@ -1,7 +1,5 @@
// -*- C++ -*-
//
-//$Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 7a5abeac4be..d26fceed65f 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Big_Reply_i.h"
Big_Reply_i::Big_Reply_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Big_Reply/Test.idl b/TAO/tests/Big_Reply/Test.idl
index 442d6a746be..0d889c15e73 100644
--- a/TAO/tests/Big_Reply/Test.idl
+++ b/TAO/tests/Big_Reply/Test.idl
@@ -1,4 +1,3 @@
-//$Id$
module Test
{
diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
index a08bd75a215..0752ac2b471 100644
--- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
+++ b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2241_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2241_Regression/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Bug_2241_Regression/Collocated_Test.cpp
+++ b/TAO/tests/Bug_2241_Regression/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2935_Regression/source.cpp b/TAO/tests/Bug_2935_Regression/source.cpp
index 3557bddefb2..2c47c3ebe47 100644
--- a/TAO/tests/Bug_2935_Regression/source.cpp
+++ b/TAO/tests/Bug_2935_Regression/source.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "source_i.h"
// A ThreeTier client that calls tick and/or tock
diff --git a/TAO/tests/Bug_2935_Regression/source_i.cpp b/TAO/tests/Bug_2935_Regression/source_i.cpp
index 60da616a755..dec6db49ea3 100644
--- a/TAO/tests/Bug_2935_Regression/source_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/source_i.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "source_i.h"
Source_i::Source_i (ThreeTier_ptr target)
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 22350fbb485..835c6b05060 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/SString.h"
#include "Manager.h"
#include "test_i.h"
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index f9c7188b6aa..abf99ba5968 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef _MANAGER_H_
#define _MANAGER_H_
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
index b73c744a21b..456ee812712 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Echo_Client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/tests/Bug_3683_Regression/client.cpp b/TAO/tests/Bug_3683_Regression/client.cpp
index 41f99b1df94..d3851527028 100644
--- a/TAO/tests/Bug_3683_Regression/client.cpp
+++ b/TAO/tests/Bug_3683_Regression/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "Echo_Client_i.h"
// The client program for the application.
diff --git a/TAO/tests/COIOP/COIOP_Simple_Test.cpp b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
index d3236b2691b..40d2d5cb296 100644
--- a/TAO/tests/COIOP/COIOP_Simple_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "ace/Get_Opt.h"
#include "Hello.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp
index 3307a10c1fc..0facd82fbec 100644
--- a/TAO/tests/COIOP/COIOP_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
index cbb1c8570cb..cf3dce625fa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(CSD_TP_Test_Lib) : taolib_with_idl, csd_threadpool, avoids_corba_e_micro {
sharedname = CSD_TP_Test
dynamicflags += CSD_TP_TEST_BUILD_DLL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
index 18d15450a42..c3ffbdcbd09 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
@@ -1,4 +1,3 @@
-//$Id$
project : csd_tp_test_lib, avoids_corba_e_micro {
sharedname = CSD_TP_Foo_A
dynamicflags += CSD_TP_FOO_A_BUILD_DLL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
index 13a886aa7b6..c13079d1343 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(csd_tp_foo_b_lib) : csd_tp_test_lib, avoids_corba_e_micro {
sharedname = CSD_TP_Foo_B
dynamicflags += CSD_TP_FOO_B_BUILD_DLL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
index ce4de5aa917..1cf306f2029 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
@@ -1,4 +1,3 @@
-//$Id$
project : csd_tp_test_lib, avoids_corba_e_micro {
sharedname = CSD_TP_Foo_C
dynamicflags += CSD_TP_FOO_C_BUILD_DLL
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_DerivedIF/Collocated_Test.cpp b/TAO/tests/Collocated_DerivedIF/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_DerivedIF/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_Forwarding/test.idl b/TAO/tests/Collocated_Forwarding/test.idl
index b141b4afb32..6caae6056c3 100644
--- a/TAO/tests/Collocated_Forwarding/test.idl
+++ b/TAO/tests/Collocated_Forwarding/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-//$Id$
-
#include "tao/PortableInterceptor.pidl"
#include "tao/PI_Server/PI_Server_include.pidl"
diff --git a/TAO/tests/Collocated_NoColl/Collocated_Test.cpp b/TAO/tests/Collocated_NoColl/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_NoColl/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_NoColl/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp/Collocated_Test.cpp b/TAO/tests/Collocated_ThruP_Sp/Collocated_Test.cpp
index eade083328b..c39aa8eafef 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
index 282295ad5e3..1874b4d03bd 100644
--- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
index c62f0414f05..98685324a0f 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
index a166851db35..507c484bccc 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
// This include is needed for static builds to initialize DII_Arguments_Converter
// service object.
//#include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
index be02cf356e5..c2dbebb87a5 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
// note: This order of header inclusion is required in order to satisfy
// template instantiation rules.
diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
index 99d297a3024..134dafde1e0 100644
--- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
+++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h
@@ -1,5 +1,3 @@
-//$Id$
-
#include "tao/Messaging/MessagingS.h"
#include "tao/DynamicInterface/DII_Reply_Handler.h"
#include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
diff --git a/TAO/tests/Exposed_Policies/Counter.idl b/TAO/tests/Exposed_Policies/Counter.idl
index d8fa1959ce3..23f2ad366ec 100644
--- a/TAO/tests/Exposed_Policies/Counter.idl
+++ b/TAO/tests/Exposed_Policies/Counter.idl
@@ -1,5 +1,3 @@
-//$Id$
-
/// This interface abstracts a counter. It provides methods
/// for increasing and getting the value of the counter.
interface Counter
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 9ec2282ccda..0c80c2c6e3c 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Counter_i.h"
// Dtor-Ctor Implementation.
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index e943914b047..8f90aef7cfc 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "RT_Properties.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 370dde2c27a..3b27211a43c 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
////////////////////////////////////////////////////////////////////////
// This files tests the Client exposed policies:
// - PriorityModelPolicy
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Test.idl b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Test.idl
index 442d6a746be..0d889c15e73 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Test.idl
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Test.idl
@@ -1,4 +1,3 @@
-//$Id$
module Test
{
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl b/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl
index b24866358c6..56d57c32e8c 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef INHERITED_OP_IDL
#define INHERITED_OP_IDL
diff --git a/TAO/tests/InterOp-Naming/INS.idl b/TAO/tests/InterOp-Naming/INS.idl
index 7af7e68c8df..00c691a852a 100644
--- a/TAO/tests/InterOp-Naming/INS.idl
+++ b/TAO/tests/InterOp-Naming/INS.idl
@@ -1,5 +1,3 @@
-//$Id$
-
#ifndef INS_TEST_IDL
#define INS_TEST_IDL
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index 75f6a6536da..3bc1670be25 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Server_i.h"
#include "tao/debug.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index d4981d2deae..6c708867d65 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Manager.h"
#include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index a2444547279..7f6aa4f24a7 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef _MANAGER_H_
#define _MANAGER_H_
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 46f6fbd0c1e..b451595ee00 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Multiple_Impl.h"
#include "Collocation_Tester.h"
diff --git a/TAO/tests/OBV/Any/Any.idl b/TAO/tests/OBV/Any/Any.idl
index 23038e8e90a..511fda0f1e7 100644
--- a/TAO/tests/OBV/Any/Any.idl
+++ b/TAO/tests/OBV/Any/Any.idl
@@ -1,5 +1,3 @@
-//$Id$
-
//
// This file contains few valuetypes to show and test basic CORBA any
// functionality related to valuetypes.
diff --git a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index b0532b8e688..2bd9ea73219 100644
--- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index e83a9203b6a..9a677c602a9 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Client_i.h"
#include "OBV_impl.h"
diff --git a/TAO/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp
index 00c6b05e692..8b8114307c8 100644
--- a/TAO/tests/OBV/Simple/client.cpp
+++ b/TAO/tests/OBV/Simple/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
# include "Client_i.h"
// The client program for the application.
diff --git a/TAO/tests/Objref_Sequence_Test/Test.idl b/TAO/tests/Objref_Sequence_Test/Test.idl
index c38f43a0c14..99d1c044aad 100644
--- a/TAO/tests/Objref_Sequence_Test/Test.idl
+++ b/TAO/tests/Objref_Sequence_Test/Test.idl
@@ -1,4 +1,3 @@
-//$Id$
/// Simple interface to send object references back and forth
interface Server;
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 89484499c3a..27798aeba9b 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 6a0b96a4acb..debc674c648 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "TestS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/DSI/POA_DSI.mpc b/TAO/tests/POA/DSI/POA_DSI.mpc
index e866b93a919..43700b07f15 100644
--- a/TAO/tests/POA/DSI/POA_DSI.mpc
+++ b/TAO/tests/POA/DSI/POA_DSI.mpc
@@ -1,4 +1,3 @@
-//$Id$
project(*IDL): taoidldefaults {
IDL_Files {
Database.idl
diff --git a/TAO/tests/POA/NewPOA/POA_NewPOA.mpc b/TAO/tests/POA/NewPOA/POA_NewPOA.mpc
index 637cf6131ee..084aa9dc72b 100644
--- a/TAO/tests/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/tests/POA/NewPOA/POA_NewPOA.mpc
@@ -1,4 +1,3 @@
-//$Id$
project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = NewPOA
}
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
index 741fb6c3ba6..359f2590012 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 0c8b1be11c7..0ed916d376c 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
#include "Echo_Collocated_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index 234f16075d1..75e81e3d200 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
index 034ca0322bb..d4f68f87d1d 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
index 765508c93d2..4a8f1d81c9e 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
index afc44b481dd..a0b4bb2cb35 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "Server_Task.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h
index 47682ac2328..2138e9e7731 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef THREAD_TASK_H
#define THREAD_TASK_H
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 007b76c1d89..cffcf82dbaf 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef Thread_Action_H
#define Thread_Action_H
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index 44c960cca60..24043b9cbd3 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 77d8487cf16..fe6cfa85767 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Scheduler.h"
#include "tao/ORB.h"
#include "ace/Atomic_Op.h"
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index 3b8c3b0110b..20bab1d2c17 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef SCHEDULER_H
#define SCHEDULER_H
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl b/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl
index af5ea5b8b16..0572d63c808 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl
@@ -1,4 +1,3 @@
-//$Id$
interface test
{
oneway void one_way (in string message);
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 96af1ad9a57..292b1e7ba73 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "testC.h"
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 43f753a7235..689176c7dc2 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
#include "testS.h"
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
index 8d0441d08d3..c59f70affb6 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h
@@ -1,4 +1,3 @@
-//$Id$
#ifndef THREAD_TASK_H
#define THREAD_TASK_H
diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h
index 6bb9b97b36a..853c89e1cc2 100644
--- a/TAO/tests/RTScheduling/VoidData/test.h
+++ b/TAO/tests/RTScheduling/VoidData/test.h
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/Log_Msg.h"
class test_impl :public test
diff --git a/TAO/tests/RTScheduling/VoidData/test.idl b/TAO/tests/RTScheduling/VoidData/test.idl
index a806fa8a09a..72f3daefdf3 100644
--- a/TAO/tests/RTScheduling/VoidData/test.idl
+++ b/TAO/tests/RTScheduling/VoidData/test.idl
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/RTScheduling/RTScheduler_include.pidl"
local interface test
{
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index e2b29cf941c..a33ab79e654 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/RTScheduling/RTScheduler.h"
#include "testC.h"
#include "test.h"
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index a6d5caa0f2e..da799a02038 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -1,4 +1,3 @@
-//$Id$
#define ACE_BUILD_SVC_DLL
#include "Smart_Test_Factory.h"
diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
index 39dcc2ce692..6e4e96d7f33 100644
--- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "Smart_Proxy_Impl.h"
Test_ptr
diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
index 8161ff23d2d..719a6568c48 100644
--- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-//$Id$
-
#include "testC.h"
extern bool dtor_called;
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 1e9be0a8579..cd5d62b9c3a 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
index c672d6d72fd..a9a8119004c 100644
--- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc
+++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
@@ -1,5 +1,3 @@
-//$Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index ffbcf770d1b..36636331b5a 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Smart_Proxies/dtor/test.idl b/TAO/tests/Smart_Proxies/dtor/test.idl
index 06d125afd30..fbb16dbac22 100644
--- a/TAO/tests/Smart_Proxies/dtor/test.idl
+++ b/TAO/tests/Smart_Proxies/dtor/test.idl
@@ -1,5 +1,3 @@
-//$Id$
-
// This test is to ensure if the destruction process
// and the _non_existent() function in the smart proxy
// is working properly.
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index c4fbf9ce71c..06050a3169a 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "timer.h"