summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
commitc88815f2039e7152d735c18650c102df84d9aa36 (patch)
treea703b59c98e6739970c4f3b51396c2284c9ce12b /TAO
parent0fbdabcd0a8970712cbbdef06465d061a4ec13c4 (diff)
downloadATCD-c88815f2039e7152d735c18650c102df84d9aa36.tar.gz
Removed single line Id tag
Diffstat (limited to 'TAO')
-rw-r--r--TAO/DevGuideExamples/AMH/AMH.mpc2
-rw-r--r--TAO/DevGuideExamples/AMH/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/AMH/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/amh_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/amh_pch.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/client.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner.idl2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_cb.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_server.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle.idl2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle_server.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp2
-rw-r--r--TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/started_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/started_pch.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/common.cpp2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/common.h2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger.idl2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Logger_i.h2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/_pch.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/bank.idl2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/client.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/server.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp2
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h2
-rw-r--r--TAO/TAO_IDL/ast/ast_argument.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_array.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_attribute.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_check.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_component.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_component_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_concrete_type.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_connector.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_constant.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_consumes.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_decl.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_emits.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_enum.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_enum_val.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_eventtype.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_exception.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_expression.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_extended_port.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_factory.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_field.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_finder.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_generator.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_home.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_interface.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_interface_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_mirror_port.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_module.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_native.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_operation.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_param_holder.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_porttype.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_predefined_type.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_provides.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_publishes.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_recursive.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_root.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_sequence.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_string.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_structure.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_structure_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_template_module.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_template_module_inst.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_template_module_ref.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_type.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_typedef.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_union.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_union_branch.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_union_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_union_label.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_uses.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_valuebox.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_valuetype.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_visitor.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_connector.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_consumes.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_emits.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_extended_port.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_generator.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_identifier_helper.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_init.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_mirror_port.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_porttype.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_produce.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_provides.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_publishes.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_template_module.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_template_module_inst.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_template_module_ref.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_tmplinst.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_uses.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_attr_assign.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_attr_init.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_attr_return.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_null_return_value.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp2
-rw-r--r--TAO/TAO_IDL/be_include/TAO_IDL_BE_Export.h1
-rw-r--r--TAO/TAO_IDL/be_include/be_connector.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_consumes.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_emits.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_exception.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_extern.h1
-rw-r--r--TAO/TAO_IDL/be_include/be_generator.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_provides.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_publishes.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_template_module_inst.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_template_module_ref.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_union_label.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_uses.h2
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp2
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_component_header.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_declarator.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_extern.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_global.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_home_header.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_init.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_interface_header.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_obv_header.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_private.cpp2
-rw-r--r--TAO/TAO_IDL/fe/fe_utils.cpp2
-rw-r--r--TAO/TAO_IDL/fe/y.tab.cpp1
-rw-r--r--TAO/TAO_IDL/fe/y.tab.h1
-rw-r--r--TAO/TAO_IDL/include/TAO_IDL_FE_Export.h1
-rw-r--r--TAO/TAO_IDL/include/ast.h1
-rw-r--r--TAO/TAO_IDL/include/ast_argument.h1
-rw-r--r--TAO/TAO_IDL/include/ast_array.h1
-rw-r--r--TAO/TAO_IDL/include/ast_attribute.h1
-rw-r--r--TAO/TAO_IDL/include/ast_component.h2
-rw-r--r--TAO/TAO_IDL/include/ast_component_fwd.h2
-rw-r--r--TAO/TAO_IDL/include/ast_concrete_type.h1
-rw-r--r--TAO/TAO_IDL/include/ast_connector.h2
-rw-r--r--TAO/TAO_IDL/include/ast_constant.h1
-rw-r--r--TAO/TAO_IDL/include/ast_consumes.h2
-rw-r--r--TAO/TAO_IDL/include/ast_decl.h1
-rw-r--r--TAO/TAO_IDL/include/ast_emits.h2
-rw-r--r--TAO/TAO_IDL/include/ast_enum.h1
-rw-r--r--TAO/TAO_IDL/include/ast_enum_val.h1
-rw-r--r--TAO/TAO_IDL/include/ast_eventtype.h2
-rw-r--r--TAO/TAO_IDL/include/ast_eventtype_fwd.h2
-rw-r--r--TAO/TAO_IDL/include/ast_exception.h1
-rw-r--r--TAO/TAO_IDL/include/ast_expression.h1
-rw-r--r--TAO/TAO_IDL/include/ast_extended_port.h2
-rw-r--r--TAO/TAO_IDL/include/ast_extern.h1
-rw-r--r--TAO/TAO_IDL/include/ast_factory.h1
-rw-r--r--TAO/TAO_IDL/include/ast_field.h1
-rw-r--r--TAO/TAO_IDL/include/ast_finder.h2
-rw-r--r--TAO/TAO_IDL/include/ast_generator.h1
-rw-r--r--TAO/TAO_IDL/include/ast_home.h2
-rw-r--r--TAO/TAO_IDL/include/ast_interface.h1
-rw-r--r--TAO/TAO_IDL/include/ast_interface_fwd.h1
-rw-r--r--TAO/TAO_IDL/include/ast_mirror_port.h2
-rw-r--r--TAO/TAO_IDL/include/ast_module.h1
-rw-r--r--TAO/TAO_IDL/include/ast_native.h2
-rw-r--r--TAO/TAO_IDL/include/ast_operation.h1
-rw-r--r--TAO/TAO_IDL/include/ast_param_holder.h2
-rw-r--r--TAO/TAO_IDL/include/ast_porttype.h2
-rw-r--r--TAO/TAO_IDL/include/ast_predefined_type.h1
-rw-r--r--TAO/TAO_IDL/include/ast_provides.h2
-rw-r--r--TAO/TAO_IDL/include/ast_publishes.h2
-rw-r--r--TAO/TAO_IDL/include/ast_root.h1
-rw-r--r--TAO/TAO_IDL/include/ast_sequence.h1
-rw-r--r--TAO/TAO_IDL/include/ast_string.h1
-rw-r--r--TAO/TAO_IDL/include/ast_structure.h1
-rw-r--r--TAO/TAO_IDL/include/ast_structure_fwd.h2
-rw-r--r--TAO/TAO_IDL/include/ast_template_module.h2
-rw-r--r--TAO/TAO_IDL/include/ast_template_module_inst.h2
-rw-r--r--TAO/TAO_IDL/include/ast_template_module_ref.h2
-rw-r--r--TAO/TAO_IDL/include/ast_type.h1
-rw-r--r--TAO/TAO_IDL/include/ast_typedef.h1
-rw-r--r--TAO/TAO_IDL/include/ast_union.h1
-rw-r--r--TAO/TAO_IDL/include/ast_union_branch.h1
-rw-r--r--TAO/TAO_IDL/include/ast_union_fwd.h2
-rw-r--r--TAO/TAO_IDL/include/ast_union_label.h1
-rw-r--r--TAO/TAO_IDL/include/ast_uses.h2
-rw-r--r--TAO/TAO_IDL/include/ast_valuebox.h2
-rw-r--r--TAO/TAO_IDL/include/ast_valuetype.h2
-rw-r--r--TAO/TAO_IDL/include/ast_valuetype_fwd.h2
-rw-r--r--TAO/TAO_IDL/include/drv_extern.h2
-rw-r--r--TAO/TAO_IDL/include/fe_component_header.h2
-rw-r--r--TAO/TAO_IDL/include/fe_declarator.h2
-rw-r--r--TAO/TAO_IDL/include/fe_extern.h2
-rw-r--r--TAO/TAO_IDL/include/fe_home_header.h2
-rw-r--r--TAO/TAO_IDL/include/fe_interface_header.h2
-rw-r--r--TAO/TAO_IDL/include/fe_obv_header.h2
-rw-r--r--TAO/TAO_IDL/include/fe_private.h2
-rw-r--r--TAO/TAO_IDL/include/fe_utils.h2
-rw-r--r--TAO/TAO_IDL/include/global_extern.h2
-rw-r--r--TAO/TAO_IDL/include/idl_defines.h2
-rw-r--r--TAO/TAO_IDL/include/idl_global.h2
-rw-r--r--TAO/TAO_IDL/include/idl_narrow.h2
-rw-r--r--TAO/TAO_IDL/include/nr_extern.h2
-rw-r--r--TAO/TAO_IDL/include/utl_decllist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_err.h2
-rw-r--r--TAO/TAO_IDL/include/utl_exceptlist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_exprlist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_identifier.h2
-rw-r--r--TAO/TAO_IDL/include/utl_idlist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_indenter.h2
-rw-r--r--TAO/TAO_IDL/include/utl_labellist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_list.h2
-rw-r--r--TAO/TAO_IDL/include/utl_namelist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_scope.h1
-rw-r--r--TAO/TAO_IDL/include/utl_scope_T.cpp2
-rw-r--r--TAO/TAO_IDL/include/utl_scoped_name.h2
-rw-r--r--TAO/TAO_IDL/include/utl_stack.h2
-rw-r--r--TAO/TAO_IDL/include/utl_string.h2
-rw-r--r--TAO/TAO_IDL/include/utl_strlist.h2
-rw-r--r--TAO/TAO_IDL/narrow/narrow.cpp2
-rw-r--r--TAO/TAO_IDL/tao_idl.cpp2
-rw-r--r--TAO/TAO_IDL/tao_idl.mpc2
-rw-r--r--TAO/TAO_IDL/tao_idl_be.mpc2
-rw-r--r--TAO/TAO_IDL/tao_idl_fe.mpc2
-rw-r--r--TAO/TAO_IDL/util/utl_decllist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_err.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_exceptlist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_exprlist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_global.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_identifier.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_idlist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_indenter.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_labellist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_list.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_namelist.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_scope.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_stack.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_string.cpp2
-rw-r--r--TAO/TAO_IDL/util/utl_strlist.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Common_Export.h1
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h2
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc1
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc2
-rw-r--r--TAO/docs/tutorials/Quoter/idl/quoter_common_export.h1
-rw-r--r--TAO/examples/AMH/Sink_Server/Base_Server.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/Base_Server.inl2
-rw-r--r--TAO/examples/AMH/Sink_Server/Client_Task.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/Sink_Server.mpc2
-rw-r--r--TAO/examples/AMH/Sink_Server/mt_server.cpp2
-rw-r--r--TAO/examples/AMH/Sink_Server/st_server.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/FL_Callback.mpc2
-rw-r--r--TAO/examples/AMI/FL_Callback/Peer_i.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/Progress_i.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/peer.cpp2
-rw-r--r--TAO/examples/AMI/FL_Callback/progress.cpp2
-rw-r--r--TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc2
-rw-r--r--TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc2
-rw-r--r--TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc2
-rw-r--r--TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc2
-rw-r--r--TAO/examples/Advanced/ch_3/server.cpp1
-rw-r--r--TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc2
-rw-r--r--TAO/examples/Borland/Broadcaster.idl2
-rw-r--r--TAO/examples/Borland/ChatClient.cpp1
-rw-r--r--TAO/examples/Borland/ChatClient.mpc2
-rw-r--r--TAO/examples/Borland/ChatClientWnd.cpp1
-rw-r--r--TAO/examples/Borland/ChatClientWnd.h1
-rw-r--r--TAO/examples/Borland/ORBThread.cpp1
-rw-r--r--TAO/examples/Borland/ORBThread.h1
-rw-r--r--TAO/examples/Borland/Receiver.idl2
-rw-r--r--TAO/examples/Borland/ReceiverImpl.cpp1
-rw-r--r--TAO/examples/Borland/ReceiverImpl.h1
-rw-r--r--TAO/examples/Borland/pch.h1
-rw-r--r--TAO/examples/Buffered_AMI/Buffered_AMI.mpc2
-rw-r--r--TAO/examples/Buffered_AMI/server.cpp2
-rw-r--r--TAO/examples/Buffered_AMI/test_i.cpp2
-rw-r--r--TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc2
-rw-r--r--TAO/examples/Buffered_Oneways/server.cpp2
-rw-r--r--TAO/examples/Buffered_Oneways/test_i.cpp2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp1
-rw-r--r--TAO/examples/Callback_Quoter/Callback_Quoter.mpc2
-rw-r--r--TAO/examples/Callback_Quoter/Consumer.idl2
-rw-r--r--TAO/examples/Callback_Quoter/Notifier.idl2
-rw-r--r--TAO/examples/Callback_Quoter/consumer.cpp2
-rw-r--r--TAO/examples/Callback_Quoter/notifier.cpp2
-rw-r--r--TAO/examples/Callback_Quoter/supplier.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/client.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/server.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/client.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/server.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/client.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/server.cpp2
-rw-r--r--TAO/examples/Event_Comm/Consumer_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Consumer_Input_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Event_Comm.mpc2
-rw-r--r--TAO/examples/Event_Comm/Event_Comm_i.cpp2
-rw-r--r--TAO/examples/Event_Comm/Notifier_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/Notifier_Server.cpp2
-rw-r--r--TAO/examples/Event_Comm/Supplier_Input_Handler.cpp2
-rw-r--r--TAO/examples/Event_Comm/consumer.cpp2
-rw-r--r--TAO/examples/Event_Comm/notifier.cpp2
-rw-r--r--TAO/examples/Event_Comm/supplier.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl2
-rw-r--r--TAO/examples/Load_Balancing/Load_Balancing.mpc2
-rw-r--r--TAO/examples/Load_Balancing_persistent/Identity_Server.cpp2
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp1
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc2
-rw-r--r--TAO/examples/Logging/Logger.idl2
-rw-r--r--TAO/examples/Logging/Logger_i.cpp2
-rw-r--r--TAO/examples/Logging/Logging.mpc2
-rw-r--r--TAO/examples/Logging/Logging_Service.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Service_i.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Test.cpp2
-rw-r--r--TAO/examples/Logging/Logging_Test_i.cpp2
-rw-r--r--TAO/examples/OBV/Simple_util.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types.idl2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.h2
-rw-r--r--TAO/examples/OBV/Typed_Events/Server_i.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Typed_Events.mpc2
-rw-r--r--TAO/examples/OBV/Typed_Events/server.cpp1
-rw-r--r--TAO/examples/Persistent_Grid/Grid.idl2
-rw-r--r--TAO/examples/Persistent_Grid/Grid_i.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/Persistent_Grid.mpc2
-rw-r--r--TAO/examples/Persistent_Grid/client.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/persistent_client.cpp2
-rw-r--r--TAO/examples/Persistent_Grid/server.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/Performance.mpc2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP.idl2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp2
-rw-r--r--TAO/examples/Quoter/Quoter.mpc2
-rw-r--r--TAO/examples/Quoter/client.cpp2
-rw-r--r--TAO/examples/RTCORBA/Activity/Activity.mpc2
-rw-r--r--TAO/examples/RTCORBA/Activity/activity_export.h1
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc2
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h1
-rw-r--r--TAO/examples/RTScheduling/Job.mpc2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h1
-rw-r--r--TAO/examples/RTScheduling/RTSchedTestLib.mpc2
-rw-r--r--TAO/examples/RTScheduling/Synch.mpc2
-rw-r--r--TAO/examples/RTScheduling/job_export.h1
-rw-r--r--TAO/examples/RTScheduling/rtschedtestlib_export.h1
-rw-r--r--TAO/examples/RTScheduling/synch_export.h1
-rw-r--r--TAO/examples/Simple/Simple_util.cpp2
-rw-r--r--TAO/examples/Simple/bank/AccountManager_i.cpp2
-rw-r--r--TAO/examples/Simple/bank/Account_i.cpp2
-rw-r--r--TAO/examples/Simple/bank/Bank.idl2
-rw-r--r--TAO/examples/Simple/bank/bank.mpc2
-rw-r--r--TAO/examples/Simple/bank/client.cpp2
-rw-r--r--TAO/examples/Simple/bank/server.cpp1
-rw-r--r--TAO/examples/Simple/chat/Broadcaster.idl2
-rw-r--r--TAO/examples/Simple/chat/Receiver.idl2
-rw-r--r--TAO/examples/Simple/chat/chat.mpc2
-rw-r--r--TAO/examples/Simple/echo/Echo.idl2
-rw-r--r--TAO/examples/Simple/echo/Echo_i.cpp2
-rw-r--r--TAO/examples/Simple/echo/echo.mpc2
-rw-r--r--TAO/examples/Simple/echo/server.cpp1
-rw-r--r--TAO/examples/Simple/grid/Grid.idl2
-rw-r--r--TAO/examples/Simple/grid/Grid_i.cpp2
-rw-r--r--TAO/examples/Simple/grid/client.cpp2
-rw-r--r--TAO/examples/Simple/grid/grid.mpc2
-rw-r--r--TAO/examples/Simple/grid/server.cpp1
-rw-r--r--TAO/examples/Simple/time-date/Alt_Resource_Factory.h2
-rw-r--r--TAO/examples/Simple/time-date/Simple_time_date.mpc2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date.cpp2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date.idl2
-rw-r--r--TAO/examples/Simple/time-date/Time_Date_i.cpp2
-rw-r--r--TAO/examples/Simple/time-date/client.cpp2
-rw-r--r--TAO/examples/Simple/time/Time.idl2
-rw-r--r--TAO/examples/Simple/time/Time_i.cpp2
-rw-r--r--TAO/examples/Simple/time/server.cpp1
-rw-r--r--TAO/examples/Simple/time/time.mpc2
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc2
-rw-r--r--TAO/examples/Simulator/NavWeap.idl2
-rw-r--r--TAO/examples/Simulator/Persian.idl2
-rw-r--r--TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc2
-rw-r--r--TAO/examples/TypeCode_Creation/main.cpp2
-rw-r--r--TAO/examples/ior_corbaloc/corbaloc.idl2
-rw-r--r--TAO/examples/ior_corbaloc/ior_corbaloc.mpc2
-rw-r--r--TAO/examples/ior_corbaloc/server.cpp1
-rw-r--r--TAO/examples/ior_corbaloc/status_i.cpp2
-rw-r--r--TAO/examples/ior_corbaloc/status_i.h2
-rw-r--r--TAO/examples/mfc/MainFrm.cpp2
-rw-r--r--TAO/examples/mfc/MainFrm.h2
-rw-r--r--TAO/examples/mfc/Resource.h2
-rw-r--r--TAO/examples/mfc/StdAfx.cpp2
-rw-r--r--TAO/examples/mfc/StdAfx.h2
-rw-r--r--TAO/examples/mfc/client.cpp2
-rw-r--r--TAO/examples/mfc/client.mpc2
-rw-r--r--TAO/examples/mfc/server.cpp2
-rw-r--r--TAO/examples/mfc/server.h2
-rw-r--r--TAO/examples/mfc/server.mpc2
-rw-r--r--TAO/examples/mfc/serverDoc.cpp2
-rw-r--r--TAO/examples/mfc/serverDoc.h2
-rw-r--r--TAO/examples/mfc/serverView.cpp2
-rw-r--r--TAO/examples/mfc/serverView.h2
-rw-r--r--TAO/examples/mfc/w32_test.idl2
-rw-r--r--TAO/examples/mfc/w32_test_impl.cpp2
-rw-r--r--TAO/examples/mfc/w32_test_impl.h2
-rw-r--r--TAO/interop-tests/AnyTypeCode/idl/Demo.idl2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.cpp1
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Client.cpp1
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Demo.mpc1
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp1
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Demo_i.h2
-rw-r--r--TAO/interop-tests/AnyTypeCode/tao/Server.cpp1
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/CdrOutArg.mpc2
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/client.cpp2
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp2
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/server.cpp2
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp2
-rw-r--r--TAO/interop-tests/CdrOutArg/tao/test_i.cpp2
-rw-r--r--TAO/interop-tests/wchar/interop_wchar.idl2
-rw-r--r--TAO/interop-tests/wchar/interop_wchar.mpc2
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc2
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp2
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp2
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp2
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc2
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp2
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h1
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc1
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc1
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Server.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.mpc2
-rw-r--r--TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_extern.h1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_init.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/be_produce.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_args.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_preproc.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_private_ifr.h2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h2
-rw-r--r--TAO/orbsvcs/IFR_Service/tao_idl.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Info.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/activator_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/locator_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Push_Handler.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.mpc2
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Server.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.mpc2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service_Export.h1
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp2
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc2
-rw-r--r--TAO/orbsvcs/TAO_Service/TAO_Service.mpc2
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service.mpc2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Server.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Server.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp1
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc1
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Log_Event.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h1
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc1
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc1
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway.idl2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/ORT.mpc2
-rw-r--r--TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Object_Factory_i.h2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h2
-rw-r--r--TAO/orbsvcs/examples/ORT/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/gateway_server.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server.idl2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server_i.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc1
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/TCP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/media_timer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/ntp-time.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/sfp.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosConcurrency.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosProperty.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTime.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTrading.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Daemon_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/esf_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/sched_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FTORB.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtNaming.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Options.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log_Macros.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log_Macros.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Builder.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Peer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RT_Notification.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RtecBase.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/RtecScheduler.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/sched_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/security_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel3.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Svc_Utils.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/TimeService.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/sfp.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/svc_utils_export.h1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1436_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc1
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.h2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Concurrency.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Complex.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Gateway.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Negation.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Schedule.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Timeout.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h1
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc1
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.inl2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Event_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/ectest_export.h1
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_App.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast.idl2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Airplane.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Nestea.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/test.idl1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc1
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/Driver.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/sig.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Name.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/common.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/notify_test_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/Property.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Sched/DynSched_Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched/Sched.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Callback.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Time/Time.mpc2
-rw-r--r--TAO/orbsvcs/tests/Time/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/TTest.idl2
-rw-r--r--TAO/orbsvcs/tests/Trading/Trading.mpc2
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/ttest_export.h1
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/corbaname.idl2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc2
-rw-r--r--TAO/performance-tests/Anyop/Anyop.mpc1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc2
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp1
-rw-r--r--TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h1
-rw-r--r--TAO/performance-tests/Callback/Callback.mpc2
-rw-r--r--TAO/performance-tests/Callback/Callback_i.cpp2
-rw-r--r--TAO/performance-tests/Callback/Callback_i.h2
-rw-r--r--TAO/performance-tests/Callback/Callback_i.inl2
-rw-r--r--TAO/performance-tests/Callback/Server_i.cpp2
-rw-r--r--TAO/performance-tests/Callback/Server_i.h2
-rw-r--r--TAO/performance-tests/Callback/Server_i.inl2
-rw-r--r--TAO/performance-tests/Callback/client.cpp2
-rw-r--r--TAO/performance-tests/Callback/server.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc2
-rw-r--r--TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc2
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMI/AMI.mpc2
-rw-r--r--TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h2
-rw-r--r--TAO/performance-tests/Latency/AMI/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/AMI/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/Collocation/Collocation.mpc1
-rw-r--r--TAO/performance-tests/Latency/DII/DII.mpc2
-rw-r--r--TAO/performance-tests/Latency/DII/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/DII/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/DSI/DSI.mpc2
-rw-r--r--TAO/performance-tests/Latency/DSI/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/DSI/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/Deferred/Deferred.mpc2
-rw-r--r--TAO/performance-tests/Latency/Deferred/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/Deferred/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Client_Task.h2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/client.cpp2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/server.cpp2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Foo_i.cpp2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_Growth.h2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc2
-rw-r--r--TAO/performance-tests/Memory/IORsize/Test.idl2
-rw-r--r--TAO/performance-tests/Memory/IORsize/client.cpp2
-rw-r--r--TAO/performance-tests/Memory/IORsize/server.cpp2
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc2
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/client.cpp2
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/server.cpp2
-rw-r--r--TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc2
-rw-r--r--TAO/performance-tests/POA/Create_Reference/create_reference.cpp2
-rw-r--r--TAO/performance-tests/POA/Demux/Demux.mpc2
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test.idl1
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc2
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/client.cpp2
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/collocated.cpp2
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/server.cpp2
-rw-r--r--TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc2
-rw-r--r--TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl2
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test.idl2
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Client.cpp2
-rw-r--r--TAO/performance-tests/Pluggable/PP_Test_Server.cpp2
-rw-r--r--TAO/performance-tests/Pluggable/Pluggable.mpc2
-rw-r--r--TAO/performance-tests/Pluggable/client.cpp2
-rw-r--r--TAO/performance-tests/Pluggable/server.cpp2
-rw-r--r--TAO/performance-tests/Protocols/Protocols.mpc2
-rw-r--r--TAO/performance-tests/Protocols/distributor.cpp2
-rw-r--r--TAO/performance-tests/Protocols/receiver.cpp2
-rw-r--r--TAO/performance-tests/Protocols/sender.cpp2
-rw-r--r--TAO/performance-tests/Protocols/test.idl2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc1
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h1
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/client.cpp2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/ami.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/DII.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp2
-rw-r--r--TAO/performance-tests/Throughput/Throughput.mpc2
-rw-r--r--TAO/performance-tests/Throughput/client.cpp2
-rw-r--r--TAO/performance-tests/Throughput/server.cpp2
-rw-r--r--TAO/tao/Abstract_Servant_Base.cpp2
-rw-r--r--TAO/tao/Abstract_Servant_Base.inl2
-rw-r--r--TAO/tao/Acceptor_Filter.cpp2
-rw-r--r--TAO/tao/Acceptor_Registry.cpp2
-rw-r--r--TAO/tao/Adapter.cpp2
-rw-r--r--TAO/tao/Adapter_Factory.cpp2
-rw-r--r--TAO/tao/Adapter_Registry.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Impl.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Impl_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_SystemException.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/ExceptionA.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/NVList.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/SystemExceptionA.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TAO_AnyTypeCode_Export.h1
-rw-r--r--TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCodeA.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Constants.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode.cpp2
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp2
-rw-r--r--TAO/tao/AnyTypeCode_Adapter.cpp2
-rw-r--r--TAO/tao/Argument.cpp2
-rw-r--r--TAO/tao/Array_VarOut_T.cpp2
-rw-r--r--TAO/tao/Asynch_Queued_Message.cpp2
-rw-r--r--TAO/tao/Asynch_Reply_Dispatcher_Base.cpp2
-rw-r--r--TAO/tao/BD_String_Argument_T.cpp2
-rw-r--r--TAO/tao/Basic_Argument_T.cpp2
-rw-r--r--TAO/tao/BiDir_Adapter.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDirGIOP.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/Bind_Dispatcher_Guard.cpp2
-rw-r--r--TAO/tao/Block_Flushing_Strategy.cpp2
-rw-r--r--TAO/tao/Blocked_Connect_Strategy.cpp2
-rw-r--r--TAO/tao/Buffer_Allocator_T.cpp2
-rw-r--r--TAO/tao/CDR.cpp2
-rw-r--r--TAO/tao/CORBALOC_Parser.cpp2
-rw-r--r--TAO/tao/CORBANAME_Parser.cpp2
-rw-r--r--TAO/tao/CORBA_String.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_FW_Export.h1
-rw-r--r--TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_POA.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Export.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp2
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp2
-rw-r--r--TAO/tao/Cache_Entries_T.cpp2
-rw-r--r--TAO/tao/Cleanup_Func_Registry.cpp2
-rw-r--r--TAO/tao/ClientRequestInterceptor_Adapter.cpp2
-rw-r--r--TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/Client_Strategy_Factory.cpp2
-rw-r--r--TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp2
-rw-r--r--TAO/tao/CodecFactory/CodecFactory_impl.cpp2
-rw-r--r--TAO/tao/Codeset/Codeset_Manager_i.cpp2
-rw-r--r--TAO/tao/Codeset/Codeset_Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/Codeset/UTF16_BOM_Translator.cpp2
-rw-r--r--TAO/tao/Codeset/UTF8_Latin1_Factory.cpp1
-rw-r--r--TAO/tao/Codeset/UTF8_Latin1_Factory.h2
-rw-r--r--TAO/tao/Codeset/codeset_export.h1
-rw-r--r--TAO/tao/Codeset_Manager.cpp2
-rw-r--r--TAO/tao/Codeset_Manager_Factory_Base.cpp2
-rw-r--r--TAO/tao/Collocated_Invocation.cpp2
-rw-r--r--TAO/tao/Collocation_Resolver.cpp2
-rw-r--r--TAO/tao/Compression/Base_Compressor.cpp2
-rw-r--r--TAO/tao/Compression/Compression.cpp2
-rw-r--r--TAO/tao/Compression/Compression_Manager.cpp2
-rw-r--r--TAO/tao/Compression/Compressor_Factory.cpp2
-rw-r--r--TAO/tao/Compression/bzip2/Bzip2Compressor.cpp2
-rw-r--r--TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp2
-rw-r--r--TAO/tao/Compression/bzip2/Bzip2Compressor_export.h1
-rw-r--r--TAO/tao/Compression/compression_export.h1
-rw-r--r--TAO/tao/Compression/lzo/LzoCompressor.cpp2
-rw-r--r--TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp2
-rw-r--r--TAO/tao/Compression/lzo/LzoCompressor_export.h1
-rw-r--r--TAO/tao/Compression/rle/RLECompressor.cpp2
-rw-r--r--TAO/tao/Compression/rle/RLECompressor_Factory.cpp2
-rw-r--r--TAO/tao/Compression/rle/RLECompressor_export.h1
-rw-r--r--TAO/tao/Compression/zlib/ZlibCompressor.cpp2
-rw-r--r--TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp2
-rw-r--r--TAO/tao/Compression/zlib/ZlibCompressor_export.h1
-rw-r--r--TAO/tao/Condition.cpp2
-rw-r--r--TAO/tao/Connect_Strategy.cpp2
-rw-r--r--TAO/tao/Connection_Handler.cpp2
-rw-r--r--TAO/tao/Connection_Purging_Strategy.cpp2
-rw-r--r--TAO/tao/Connector_Impl.cpp2
-rw-r--r--TAO/tao/Connector_Registry.cpp2
-rw-r--r--TAO/tao/DLL_Parser.cpp2
-rw-r--r--TAO/tao/Default_Collocation_Resolver.cpp2
-rw-r--r--TAO/tao/Default_Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/tao/Default_Stub_Factory.cpp2
-rw-r--r--TAO/tao/Default_Thread_Lane_Resources_Manager.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServPolicy.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServPolicy_Export.h1
-rw-r--r--TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.h2
-rw-r--r--TAO/tao/DynamicAny/DynCommon.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.h2
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynValueBox_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynValueCommon_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynValue_i.cpp2
-rw-r--r--TAO/tao/DynamicAny/dynamicany_export.h1
-rw-r--r--TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp2
-rw-r--r--TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl2
-rw-r--r--TAO/tao/DynamicInterface/Context.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp1
-rw-r--r--TAO/tao/DynamicInterface/DII_Invocation.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Handler.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Reply_Handler.inl2
-rw-r--r--TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/DynamicInterface/Dynamic_Implementation.cpp2
-rw-r--r--TAO/tao/DynamicInterface/ExceptionList.cpp2
-rw-r--r--TAO/tao/DynamicInterface/Request.cpp2
-rw-r--r--TAO/tao/DynamicInterface/Server_Request.cpp2
-rw-r--r--TAO/tao/DynamicInterface/Unknown_User_Exception.cpp2
-rw-r--r--TAO/tao/DynamicInterface/dynamicinterface_export.h1
-rw-r--r--TAO/tao/Dynamic_Adapter.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Config.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Task.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp2
-rw-r--r--TAO/tao/Dynamic_TP/dynamic_tp_export.h1
-rw-r--r--TAO/tao/ETCL/TAO_ETCL.mpc2
-rw-r--r--TAO/tao/ETCL/TAO_ETCL_Constraint.cpp2
-rw-r--r--TAO/tao/ETCL/TAO_ETCL_Constraint.inl2
-rw-r--r--TAO/tao/ETCL/tao_etcl_export.h1
-rw-r--r--TAO/tao/Endpoint.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy_Export.h1
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp2
-rw-r--r--TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp2
-rw-r--r--TAO/tao/Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/tao/Environment.cpp2
-rw-r--r--TAO/tao/Exception.cpp2
-rw-r--r--TAO/tao/Exclusive_TMS.cpp2
-rw-r--r--TAO/tao/FILE_Parser.cpp2
-rw-r--r--TAO/tao/Fault_Tolerance_Service.cpp2
-rw-r--r--TAO/tao/Fixed_Array_Argument_T.cpp2
-rw-r--r--TAO/tao/Fixed_Size_Argument_T.cpp2
-rw-r--r--TAO/tao/FlResource/FlResource.mpc2
-rw-r--r--TAO/tao/FlResource/FlResource_Factory.cpp2
-rw-r--r--TAO/tao/FlResource/FlResource_Loader.cpp2
-rw-r--r--TAO/tao/FlResource/TAO_FlResource_Export.h1
-rw-r--r--TAO/tao/Flushing_Strategy.cpp2
-rw-r--r--TAO/tao/FoxResource/FoxResource.mpc2
-rw-r--r--TAO/tao/FoxResource/TAO_FoxResource_Export.h1
-rw-r--r--TAO/tao/GIOP_Fragmentation_Strategy.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_10.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_11.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_12.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp2
-rw-r--r--TAO/tao/GIOP_Message_State.cpp2
-rw-r--r--TAO/tao/GIOP_Message_Version.cpp2
-rw-r--r--TAO/tao/HR_Time_Policy_Strategy.cpp2
-rw-r--r--TAO/tao/HTTP_Client.cpp2
-rw-r--r--TAO/tao/HTTP_Handler.cpp2
-rw-r--r--TAO/tao/HTTP_Parser.cpp2
-rw-r--r--TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/IFR_Client_Adapter.cpp2
-rw-r--r--TAO/tao/IIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/IIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/IIOP_Connector.cpp2
-rw-r--r--TAO/tao/IIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/IIOP_Factory.cpp2
-rw-r--r--TAO/tao/IIOP_Profile.cpp2
-rw-r--r--TAO/tao/IIOP_Transport.cpp2
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.cpp2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Details.cpp2
-rw-r--r--TAO/tao/IORInterceptor/iorinterceptor_export.h1
-rw-r--r--TAO/tao/IORInterceptor_Adapter.cpp2
-rw-r--r--TAO/tao/IORInterceptor_Adapter_Factory.cpp1
-rw-r--r--TAO/tao/IORManipulation/IORManip_Filter.cpp2
-rw-r--r--TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp2
-rw-r--r--TAO/tao/IORManipulation/IORManip_Loader.cpp2
-rw-r--r--TAO/tao/IORManipulation/IORManipulation.cpp2
-rw-r--r--TAO/tao/IORTable/Locate_ResponseHandler.inl2
-rw-r--r--TAO/tao/IOR_Parser.cpp2
-rw-r--r--TAO/tao/ImR_Client/ImR_Client.cpp2
-rw-r--r--TAO/tao/ImR_Client/ServerObject_i.cpp2
-rw-r--r--TAO/tao/ImR_Client/imr_client_export.h1
-rw-r--r--TAO/tao/Incoming_Message_Queue.cpp2
-rw-r--r--TAO/tao/Incoming_Message_Stack.cpp2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Base_T.cpp2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Handle_T.cpp2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Object_T.cpp2
-rw-r--r--TAO/tao/Invocation_Adapter.cpp2
-rw-r--r--TAO/tao/Invocation_Base.cpp2
-rw-r--r--TAO/tao/LF_CH_Event.cpp2
-rw-r--r--TAO/tao/LF_Connect_Strategy.cpp2
-rw-r--r--TAO/tao/LF_Event.cpp2
-rw-r--r--TAO/tao/LF_Event_Binder.cpp2
-rw-r--r--TAO/tao/LF_Event_Loop_Thread_Helper.cpp2
-rw-r--r--TAO/tao/LF_Follower.cpp2
-rw-r--r--TAO/tao/LF_Follower_Auto_Adder.cpp2
-rw-r--r--TAO/tao/LF_Follower_Auto_Adder.inl2
-rw-r--r--TAO/tao/LF_Follower_Auto_Ptr.cpp2
-rw-r--r--TAO/tao/LF_Invocation_Event.cpp2
-rw-r--r--TAO/tao/LF_Multi_Event.cpp2
-rw-r--r--TAO/tao/LF_Strategy.cpp2
-rw-r--r--TAO/tao/LF_Strategy_Complete.cpp2
-rw-r--r--TAO/tao/LRU_Connection_Purging_Strategy.cpp2
-rw-r--r--TAO/tao/Leader_Follower.cpp2
-rw-r--r--TAO/tao/Leader_Follower_Flushing_Strategy.cpp2
-rw-r--r--TAO/tao/LocalObject.cpp2
-rw-r--r--TAO/tao/LocateRequest_Invocation.cpp2
-rw-r--r--TAO/tao/LocateRequest_Invocation_Adapter.cpp2
-rw-r--r--TAO/tao/MCAST_Parser.cpp2
-rw-r--r--TAO/tao/MMAP_Allocator.cpp2
-rw-r--r--TAO/tao/MProfile.cpp2
-rw-r--r--TAO/tao/MProfile.inl2
-rw-r--r--TAO/tao/Messaging/AMH_Response_Handler.cpp2
-rw-r--r--TAO/tao/Messaging/AMH_Skeletons.cpp2
-rw-r--r--TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp2
-rw-r--r--TAO/tao/Messaging/Asynch_Invocation.cpp2
-rw-r--r--TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp2
-rw-r--r--TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/Messaging/Asynch_Timeout_Handler.cpp2
-rw-r--r--TAO/tao/Messaging/Buffering_Constraint_Policy.cpp2
-rw-r--r--TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp2
-rw-r--r--TAO/tao/Messaging/ExceptionHolder_i.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_Loader.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_ORBInitializer.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_PolicyFactory.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_Policy_i.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp2
-rw-r--r--TAO/tao/Messaging/messaging_export.h1
-rw-r--r--TAO/tao/Monitor/Monitor.cpp2
-rw-r--r--TAO/tao/Monitor/Monitor_Impl.cpp2
-rw-r--r--TAO/tao/Monitor/Monitor_export.h1
-rw-r--r--TAO/tao/Muxed_TMS.cpp2
-rw-r--r--TAO/tao/NVList_Adapter.cpp2
-rw-r--r--TAO/tao/Network_Priority_Protocols_Hooks.cpp2
-rw-r--r--TAO/tao/New_Leader_Generator.cpp2
-rw-r--r--TAO/tao/Null_Fragmentation_Strategy.cpp2
-rw-r--r--TAO/tao/ORBInitializer_Registry.cpp2
-rw-r--r--TAO/tao/ORBInitializer_Registry_Adapter.cpp2
-rw-r--r--TAO/tao/ORB_Core.cpp2
-rw-r--r--TAO/tao/ORB_Core_Auto_Ptr.cpp2
-rw-r--r--TAO/tao/ORB_Core_TSS_Resources.cpp2
-rw-r--r--TAO/tao/ORB_Table.cpp2
-rw-r--r--TAO/tao/ORB_Time_Policy.cpp2
-rw-r--r--TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp2
-rw-r--r--TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp2
-rw-r--r--TAO/tao/ObjRefTemplate/ort_export.h1
-rw-r--r--TAO/tao/ObjectKey_Table.cpp2
-rw-r--r--TAO/tao/ObjectKey_Table.inl2
-rw-r--r--TAO/tao/Object_Argument_T.cpp2
-rw-r--r--TAO/tao/Object_Loader.cpp2
-rw-r--r--TAO/tao/Object_Proxy_Broker.cpp2
-rw-r--r--TAO/tao/Object_Ref_Table.cpp2
-rw-r--r--TAO/tao/Object_T.cpp2
-rw-r--r--TAO/tao/Objref_VarOut_T.cpp1
-rw-r--r--TAO/tao/On_Demand_Fragmentation_Strategy.cpp2
-rw-r--r--TAO/tao/PI/ClientRequestDetails.cpp2
-rw-r--r--TAO/tao/PI/ClientRequestInfo.cpp2
-rw-r--r--TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/PI/Interceptor_List_T.cpp2
-rw-r--r--TAO/tao/PI/ORBInitInfo.cpp2
-rw-r--r--TAO/tao/PI/ORBInitializer_Registry_Impl.cpp2
-rw-r--r--TAO/tao/PI/PI.cpp2
-rw-r--r--TAO/tao/PI/PICurrent.cpp2
-rw-r--r--TAO/tao/PI/PICurrent_Impl.cpp2
-rw-r--r--TAO/tao/PI/PI_ORBInitializer.cpp2
-rw-r--r--TAO/tao/PI/PI_PolicyFactory.cpp2
-rw-r--r--TAO/tao/PI/PolicyFactory_Registry.cpp2
-rw-r--r--TAO/tao/PI/ProcessingModePolicy.cpp2
-rw-r--r--TAO/tao/PI/RequestInfo_Util.cpp2
-rw-r--r--TAO/tao/PI/pi_export.h1
-rw-r--r--TAO/tao/PI_Server/PICurrent_Guard.cpp2
-rw-r--r--TAO/tao/PI_Server/PI_Server.cpp2
-rw-r--r--TAO/tao/PI_Server/PI_Server_Loader.cpp2
-rw-r--r--TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp2
-rw-r--r--TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp2
-rw-r--r--TAO/tao/PI_Server/ServerInterceptorAdapter.cpp2
-rw-r--r--TAO/tao/PI_Server/ServerRequestDetails.cpp2
-rw-r--r--TAO/tao/PI_Server/ServerRequestInfo.cpp2
-rw-r--r--TAO/tao/PI_Server/pi_server_export.h1
-rw-r--r--TAO/tao/Parser_Registry.cpp2
-rw-r--r--TAO/tao/PolicyFactory_Registry_Adapter.cpp2
-rw-r--r--TAO/tao/Policy_Current.cpp2
-rw-r--r--TAO/tao/Policy_Current_Impl.cpp2
-rw-r--r--TAO/tao/Policy_Manager.cpp2
-rw-r--r--TAO/tao/Policy_Set.cpp2
-rw-r--r--TAO/tao/Policy_Validator.cpp2
-rw-r--r--TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Object_Map.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Object_Map_Entry.cpp2
-rw-r--r--TAO/tao/PortableServer/Active_Policy_Strategies.cpp2
-rw-r--r--TAO/tao/PortableServer/BD_String_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Basic_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp2
-rw-r--r--TAO/tao/PortableServer/Creation_Time.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Acceptor_Filter.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Policy_Validator.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp2
-rw-r--r--TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp2
-rw-r--r--TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp2
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ImR_Client_Adapter.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp2
-rw-r--r--TAO/tao/PortableServer/Key_Adapters.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyPersistent.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyTransient.cpp2
-rw-r--r--TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/Network_Priority_Hook.cpp2
-rw-r--r--TAO/tao/PortableServer/Non_Servant_Upcall.cpp2
-rw-r--r--TAO/tao/PortableServer/ORT_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp2
-rw-r--r--TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp2
-rw-r--r--TAO/tao/PortableServer/POAManager.cpp2
-rw-r--r--TAO/tao/PortableServer/POAManagerFactory.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Cached_Policies.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current_Factory.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Current_Impl.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Guard.cpp2
-rw-r--r--TAO/tao/PortableServer/POA_Policy_Set.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer.cpp1
-rw-r--r--TAO/tao/PortableServer/PortableServer_Functions.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer_WFunctions.cpp2
-rw-r--r--TAO/tao/PortableServer/Regular_POA.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp1
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp2
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp2
-rw-r--r--TAO/tao/PortableServer/SUpcall_commands.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_Upcall.cpp2
-rw-r--r--TAO/tao/PortableServer/Servant_var.cpp2
-rw-r--r--TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/StrategyFactory.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadPolicy.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategy.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategyORBControl.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategySingle.cpp2
-rw-r--r--TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp2
-rw-r--r--TAO/tao/PortableServer/UB_String_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Upcall_Command.cpp2
-rw-r--r--TAO/tao/PortableServer/Upcall_Wrapper.cpp2
-rw-r--r--TAO/tao/PortableServer/Var_Array_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Var_Size_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/Vector_SArgument_T.cpp2
-rw-r--r--TAO/tao/PortableServer/poa_macros.h2
-rw-r--r--TAO/tao/PortableServer/portableserver_export.h1
-rw-r--r--TAO/tao/Principal.cpp2
-rw-r--r--TAO/tao/Profile.cpp2
-rw-r--r--TAO/tao/Profile_Transport_Resolver.cpp2
-rw-r--r--TAO/tao/Protocol_Factory.cpp2
-rw-r--r--TAO/tao/Protocols_Hooks.cpp2
-rw-r--r--TAO/tao/Pseudo_VarOut_T.cpp2
-rw-r--r--TAO/tao/QtResource/QtResource.mpc2
-rw-r--r--TAO/tao/QtResource/TAO_QtResource_Export.h1
-rw-r--r--TAO/tao/Queued_Data.cpp2
-rw-r--r--TAO/tao/Queued_Message.cpp2
-rw-r--r--TAO/tao/Queued_Message.inl2
-rw-r--r--TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Network_Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp2
-rw-r--r--TAO/tao/RTCORBA/Priority_Mapping.cpp2
-rw-r--r--TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp2
-rw-r--r--TAO/tao/RTCORBA/RTCORBA.cpp2
-rw-r--r--TAO/tao/RTCORBA/RTCORBA.h2
-rw-r--r--TAO/tao/RTCORBA/RT_Current.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Mutex.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_ORB.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_ORBInitializer.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_ORB_Loader.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_PolicyFactory.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Policy_i.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Stub.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Stub_Factory.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp2
-rw-r--r--TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp2
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.cpp2
-rw-r--r--TAO/tao/RTCORBA/rtcorba_export.h1
-rw-r--r--TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_Policy_Validator.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp2
-rw-r--r--TAO/tao/RTPortableServer/rtportableserver_export.h1
-rw-r--r--TAO/tao/RTScheduling/Current.cpp2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler.cpp2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler.h2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_Initializer.cpp2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_Loader.cpp2
-rw-r--r--TAO/tao/RTScheduling/RTScheduler_Manager.cpp2
-rw-r--r--TAO/tao/RTScheduling/rtscheduler_export.h1
-rw-r--r--TAO/tao/Reactive_Connect_Strategy.cpp2
-rw-r--r--TAO/tao/Reactive_Flushing_Strategy.cpp2
-rw-r--r--TAO/tao/Refcounted_ObjectKey.cpp2
-rw-r--r--TAO/tao/Refcounted_ObjectKey.inl2
-rw-r--r--TAO/tao/Remote_Object_Proxy_Broker.cpp2
-rw-r--r--TAO/tao/Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/Request_Dispatcher.cpp2
-rw-r--r--TAO/tao/Resource_Factory.cpp2
-rw-r--r--TAO/tao/Resume_Handle.cpp2
-rw-r--r--TAO/tao/Seq_Out_T.cpp2
-rw-r--r--TAO/tao/Seq_Var_T.cpp2
-rw-r--r--TAO/tao/Sequence_T.h2
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter.cpp2
-rw-r--r--TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp2
-rw-r--r--TAO/tao/Server_Strategy_Factory.cpp2
-rw-r--r--TAO/tao/Service_Callbacks.cpp2
-rw-r--r--TAO/tao/Service_Context.cpp2
-rw-r--r--TAO/tao/Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/Service_Context_Handler_Registry.cpp2
-rw-r--r--TAO/tao/Services_Activate.cpp2
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.cpp2
-rw-r--r--TAO/tao/SmartProxies/smartproxies_export.h1
-rw-r--r--TAO/tao/Special_Basic_Argument_T.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Connector.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/COIOP_Transport.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Connector.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/DIOP_Transport.cpp2
-rw-r--r--TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp2
-rw-r--r--TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp2
-rw-r--r--TAO/tao/Strategies/LF_Strategy_Null.cpp2
-rw-r--r--TAO/tao/Strategies/LF_Strategy_Null.inl2
-rw-r--r--TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp2
-rw-r--r--TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.h1
-rw-r--r--TAO/tao/Strategies/SCIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Connection_Handler.h1
-rw-r--r--TAO/tao/Strategies/SCIOP_Connector.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Connector.h1
-rw-r--r--TAO/tao/Strategies/SCIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Endpoint.inl2
-rw-r--r--TAO/tao/Strategies/SCIOP_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Factory.h1
-rw-r--r--TAO/tao/Strategies/SCIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Transport.cpp2
-rw-r--r--TAO/tao/Strategies/SCIOP_Transport.h1
-rw-r--r--TAO/tao/Strategies/SHMIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Acceptor.h1
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connector.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/SHMIOP_Transport.cpp2
-rw-r--r--TAO/tao/Strategies/Strategies_ORBInitializer.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Acceptor.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Connection_Handler.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Connector.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Endpoint.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Factory.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp2
-rw-r--r--TAO/tao/Strategies/UIOP_Transport.cpp2
-rw-r--r--TAO/tao/Strategies/advanced_resource.cpp1
-rw-r--r--TAO/tao/Strategies/advanced_resource.h2
-rw-r--r--TAO/tao/Strategies/strategies_export.h1
-rw-r--r--TAO/tao/String_Alloc.cpp2
-rw-r--r--TAO/tao/Stub.cpp2
-rw-r--r--TAO/tao/Stub_Factory.cpp2
-rw-r--r--TAO/tao/Synch_Invocation.cpp2
-rw-r--r--TAO/tao/Synch_Queued_Message.cpp2
-rw-r--r--TAO/tao/Synch_Reply_Dispatcher.cpp2
-rw-r--r--TAO/tao/SystemException.cpp2
-rw-r--r--TAO/tao/System_Time_Policy_Strategy.cpp2
-rw-r--r--TAO/tao/TAO_Export.h1
-rw-r--r--TAO/tao/TAO_Internal.cpp2
-rw-r--r--TAO/tao/TAO_Server_Request.cpp2
-rw-r--r--TAO/tao/TAO_Singleton_Manager.cpp2
-rw-r--r--TAO/tao/TSS_Resources.cpp2
-rw-r--r--TAO/tao/Tagged_Components.cpp2
-rw-r--r--TAO/tao/Tagged_Profile.cpp2
-rw-r--r--TAO/tao/Thread_Lane_Resources.cpp2
-rw-r--r--TAO/tao/Thread_Lane_Resources_Manager.cpp2
-rw-r--r--TAO/tao/Time_Policy_Manager.cpp2
-rw-r--r--TAO/tao/TkResource/TAO_TkResource_Export.h1
-rw-r--r--TAO/tao/TkResource/TkResource.mpc2
-rw-r--r--TAO/tao/TkResource/TkResource_Loader.cpp2
-rw-r--r--TAO/tao/Transport.cpp2
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.h2
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer.cpp2
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp2
-rw-r--r--TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp2
-rw-r--r--TAO/tao/TransportCurrent/IIOP_Transport_Current.h2
-rw-r--r--TAO/tao/TransportCurrent/Transport_Current.h2
-rw-r--r--TAO/tao/TransportCurrent/Transport_Current_Export.h1
-rw-r--r--TAO/tao/Transport_Acceptor.cpp2
-rw-r--r--TAO/tao/Transport_Connector.cpp2
-rw-r--r--TAO/tao/Transport_Descriptor_Interface.cpp2
-rw-r--r--TAO/tao/Transport_Mux_Strategy.cpp2
-rw-r--r--TAO/tao/Transport_Queueing_Strategies.cpp2
-rw-r--r--TAO/tao/Transport_Selection_Guard.cpp2
-rw-r--r--TAO/tao/Transport_Timer.cpp2
-rw-r--r--TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp2
-rw-r--r--TAO/tao/TypeCodeFactory/typecodefactory_export.h1
-rw-r--r--TAO/tao/TypeCodeFactory_Adapter.cpp2
-rw-r--r--TAO/tao/UB_String_Argument_T.cpp2
-rw-r--r--TAO/tao/UserException.cpp2
-rw-r--r--TAO/tao/Utils/Encodable.cpp2
-rw-r--r--TAO/tao/Utils/Implicit_Deactivator.cpp2
-rw-r--r--TAO/tao/Utils/ORB_Destroyer.cpp2
-rw-r--r--TAO/tao/Utils/ORB_Manager.cpp2
-rw-r--r--TAO/tao/Utils/PolicyList_Destroyer.cpp2
-rw-r--r--TAO/tao/Utils/RIR_Narrow.cpp2
-rw-r--r--TAO/tao/Utils/Utils.mpc1
-rw-r--r--TAO/tao/Utils/utils_export.h1
-rw-r--r--TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp2
-rw-r--r--TAO/tao/Valuetype/AbstractBase_T.cpp2
-rw-r--r--TAO/tao/Valuetype/Sequence_T.h1
-rw-r--r--TAO/tao/Valuetype/ValueBase.cpp2
-rw-r--r--TAO/tao/Valuetype/ValueFactory.cpp2
-rw-r--r--TAO/tao/Valuetype/ValueFactory_Map.cpp2
-rw-r--r--TAO/tao/Valuetype/Value_VarOut_T.cpp2
-rw-r--r--TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp2
-rw-r--r--TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp2
-rw-r--r--TAO/tao/Valuetype/valuetype_export.h1
-rw-r--r--TAO/tao/Valuetype_Adapter.cpp2
-rw-r--r--TAO/tao/Valuetype_Adapter_Factory.cpp1
-rw-r--r--TAO/tao/VarOut_T.cpp2
-rw-r--r--TAO/tao/Var_Array_Argument_T.cpp2
-rw-r--r--TAO/tao/Var_Size_Argument_T.cpp2
-rw-r--r--TAO/tao/Vector_Argument_T.cpp2
-rw-r--r--TAO/tao/Version.h1
-rw-r--r--TAO/tao/Wait_On_LF_No_Upcall.cpp2
-rw-r--r--TAO/tao/Wait_On_Leader_Follower.cpp2
-rw-r--r--TAO/tao/Wait_On_Reactor.cpp2
-rw-r--r--TAO/tao/Wait_On_Read.cpp2
-rw-r--r--TAO/tao/Wait_Strategy.cpp2
-rw-r--r--TAO/tao/XtResource/TAO_XtResource_Export.h1
-rw-r--r--TAO/tao/XtResource/XtResource.mpc2
-rw-r--r--TAO/tao/ZIOP/ZIOP.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Policy_i.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp1
-rw-r--r--TAO/tao/ZIOP_Adapter.cpp2
-rw-r--r--TAO/tao/debug.cpp1
-rw-r--r--TAO/tao/default_client.cpp2
-rw-r--r--TAO/tao/default_resource.cpp2
-rw-r--r--TAO/tao/default_resource.inl2
-rw-r--r--TAO/tao/default_server.cpp2
-rw-r--r--TAO/tao/orb.idl2
-rw-r--r--TAO/tao/params.cpp2
-rw-r--r--TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc2
-rw-r--r--TAO/tests/AMH_Exceptions/client.cpp2
-rw-r--r--TAO/tests/AMH_Exceptions/server.cpp2
-rw-r--r--TAO/tests/AMH_Oneway/AMH_Oneway.mpc2
-rw-r--r--TAO/tests/AMH_Oneway/client.cpp2
-rw-r--r--TAO/tests/AMH_Oneway/server.cpp2
-rw-r--r--TAO/tests/AMI/AMI.mpc2
-rw-r--r--TAO/tests/AMI_Buffering/AMI_Buffering.mpc2
-rw-r--r--TAO/tests/AMI_Buffering/admin.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/client.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/server.cpp2
-rw-r--r--TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc2
-rw-r--r--TAO/tests/Abstract_Interface/Abstract_Interface.mpc2
-rw-r--r--TAO/tests/Abstract_Interface/client.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/server.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/test.idl2
-rw-r--r--TAO/tests/Abstract_Interface/test_i.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/test_i.h2
-rw-r--r--TAO/tests/Alt_Mapping/alt_mapping.idl2
-rw-r--r--TAO/tests/Alt_Mapping/alt_mapping.mpc2
-rw-r--r--TAO/tests/Any/Indirected/client.cpp2
-rw-r--r--TAO/tests/Any/Recursive/Hello.cpp2
-rw-r--r--TAO/tests/Any/Recursive/NonRecursive.idl1
-rw-r--r--TAO/tests/Any/Recursive/client.cpp2
-rw-r--r--TAO/tests/Any/Recursive/server.cpp2
-rw-r--r--TAO/tests/BiDirectional/BiDirectional.mpc2
-rw-r--r--TAO/tests/BiDirectional/client.cpp2
-rw-r--r--TAO/tests/BiDirectional/server.cpp2
-rw-r--r--TAO/tests/BiDirectional/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional/test_i.inl2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/test_i.inl2
-rw-r--r--TAO/tests/BiDirectional_MultipleORB/destroy.mpc2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/test_i.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/test_i.inl2
-rw-r--r--TAO/tests/Big_AMI/Big_AMI.mpc2
-rw-r--r--TAO/tests/Big_Oneways/Big_Oneways.mpc2
-rw-r--r--TAO/tests/Big_Oneways/client.cpp2
-rw-r--r--TAO/tests/Big_Oneways/server.cpp2
-rw-r--r--TAO/tests/Big_Reply/Big_Reply.mpc2
-rw-r--r--TAO/tests/Big_Reply/client.cpp2
-rw-r--r--TAO/tests/Big_Reply/server.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc2
-rw-r--r--TAO/tests/Big_Request_Muxing/client.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/server.cpp2
-rw-r--r--TAO/tests/Big_Twoways/Big_Twoways.mpc2
-rw-r--r--TAO/tests/Big_Twoways/client.cpp2
-rw-r--r--TAO/tests/Big_Twoways/server.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc2
-rw-r--r--TAO/tests/Blocking_Sync_None/client.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Echo.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1020_Regression/Server_i.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1254_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1254_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1269_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1270_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h2
-rw-r--r--TAO/tests/Bug_1361_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1383_Regression/Callee_i.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/Callee_i.h2
-rw-r--r--TAO/tests/Bug_1383_Regression/SimpleClient.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/SimpleServer.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/callee.idl2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple.idl2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple_i.cpp2
-rw-r--r--TAO/tests/Bug_1383_Regression/simple_i.h2
-rw-r--r--TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1476_Regression/Sender_i.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc2
-rw-r--r--TAO/tests/Bug_1476_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1482_Regression/Reply_Handler.cpp1
-rw-r--r--TAO/tests/Bug_1482_Regression/Reply_Handler.h1
-rw-r--r--TAO/tests/Bug_1482_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/Bug_1495.mpc2
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Server.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/server_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1535_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1551_Regression/Client_Task.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/Reply_Handler.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1636_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_1639_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1676_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1676_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc2
-rw-r--r--TAO/tests/Bug_1693_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc2
-rw-r--r--TAO/tests/Bug_1812_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1812_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc2
-rw-r--r--TAO/tests/Bug_1813_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_1813_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_1869_Regression/AMI.idl2
-rw-r--r--TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc2
-rw-r--r--TAO/tests/Bug_1869_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1869_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1904_Regression/test.cpp1
-rw-r--r--TAO/tests/Bug_1904_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_1904_Regression/test.mpc1
-rw-r--r--TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp2
-rw-r--r--TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2119_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2119_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2134_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2134_Regression/Hello.idl2
-rw-r--r--TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2144_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2174_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2183_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2186_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/broken.mpc2
-rw-r--r--TAO/tests/Bug_2188_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2201_Regression/TestData.idl2
-rw-r--r--TAO/tests/Bug_2201_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2222_Regression/TestCase.idl2
-rw-r--r--TAO/tests/Bug_2222_Regression/TestType.idl2
-rw-r--r--TAO/tests/Bug_2222_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2234_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2234_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2234_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp1
-rw-r--r--TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2289_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2319_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2328_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2345_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2349_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/foo.idl2
-rw-r--r--TAO/tests/Bug_2349_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2375_Regression/test.cpp1
-rw-r--r--TAO/tests/Bug_2375_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2399_Regression/included.idl2
-rw-r--r--TAO/tests/Bug_2399_Regression/mytmp/included.idl2
-rw-r--r--TAO/tests/Bug_2399_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2399_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2417_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher_impl.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/publisher_impl.h2
-rw-r--r--TAO/tests/Bug_2417_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber.idl2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber_impl.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/subscriber_impl.h2
-rw-r--r--TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2419_Regression/abstract_parent.idl2
-rw-r--r--TAO/tests/Bug_2419_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2419_Regression/local_child.idl1
-rw-r--r--TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc1
-rw-r--r--TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl1
-rw-r--r--TAO/tests/Bug_2424_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2429_Regression/Child.idl2
-rw-r--r--TAO/tests/Bug_2429_Regression/ChildServant.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/ChildServant.h2
-rw-r--r--TAO/tests/Bug_2429_Regression/Parent.idl2
-rw-r--r--TAO/tests/Bug_2429_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2494_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_2494_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2503_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2503_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/common.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/common.h2
-rw-r--r--TAO/tests/Bug_2503_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2542_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp2
-rw-r--r--TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2543_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp2
-rw-r--r--TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2549_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2549_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2593_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2593_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2595_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.h2
-rw-r--r--TAO/tests/Bug_2654_Regression/Hello.idl2
-rw-r--r--TAO/tests/Bug_2654_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2677_Regression/DllORB.cpp1
-rw-r--r--TAO/tests/Bug_2677_Regression/DllORB.h1
-rw-r--r--TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h1
-rw-r--r--TAO/tests/Bug_2677_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2678_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_2683_Regression/IORTable.mpc2
-rw-r--r--TAO/tests/Bug_2683_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2683_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2702_Regression/CloseConnection.mpc2
-rw-r--r--TAO/tests/Bug_2702_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2734_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2734_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2735_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2768_Regression/Messenger_i.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/Messenger_i.h2
-rw-r--r--TAO/tests/Bug_2768_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2768_Regression/server.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message.idl2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/MessageFactory.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/MessageFactory.h2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message_i.cpp2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/Message_i.h2
-rwxr-xr-xTAO/tests/Bug_2791_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2792_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2795_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2809_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp2
-rw-r--r--TAO/tests/Bug_2826_Regression/foo.idl2
-rw-r--r--TAO/tests/Bug_2844_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2869_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2918_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_2918_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2935_Regression/ThreeTier.idl2
-rw-r--r--TAO/tests/Bug_2935_Regression/middle.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/middle_i.cpp2
-rw-r--r--TAO/tests/Bug_2935_Regression/sink.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/sink_i.cpp2
-rw-r--r--TAO/tests/Bug_2936_Regression/DllORB.cpp1
-rw-r--r--TAO/tests/Bug_2936_Regression/DllORB.h1
-rw-r--r--TAO/tests/Bug_2936_Regression/PersistentPOA.h2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936.cpp2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936.mpc2
-rw-r--r--TAO/tests/Bug_2936_Regression/bug2936_export.h1
-rw-r--r--TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2953_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2953_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc2
-rw-r--r--TAO/tests/Bug_2966_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3000_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3000_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc2
-rw-r--r--TAO/tests/Bug_3042_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3068_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3068_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3108_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3108_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3108_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl2
-rw-r--r--TAO/tests/Bug_3154_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3163_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3163_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3171_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3251_Regression/DllOrb.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/DllOrb.h2
-rw-r--r--TAO/tests/Bug_3251_Regression/PersistentPoa.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/PersistentPoa.h2
-rw-r--r--TAO/tests/Bug_3251_Regression/bug_3251_export.h1
-rw-r--r--TAO/tests/Bug_3251_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3276_Regression/Servant_Locator.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/Servant_Locator.h2
-rw-r--r--TAO/tests/Bug_3276_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3276_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3299_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3299_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3299_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3311_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3311_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3315_Regression/main.cpp2
-rw-r--r--TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3321_Regression/main.cpp2
-rw-r--r--TAO/tests/Bug_3333_Regression/Bug3333.mpc2
-rw-r--r--TAO/tests/Bug_3333_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3333_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Client_i.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Client_i.h2
-rw-r--r--TAO/tests/Bug_3384_Regression/Server_i.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/Server_i.h2
-rw-r--r--TAO/tests/Bug_3384_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_3384_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3384_Regression/test.mpc2
-rw-r--r--TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3430_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3430_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3471_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3471_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3479_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3479_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp2
-rw-r--r--TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3481_Regression/Foo.idl1
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.h2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service.mpc2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_Service_export.h1
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h2
-rw-r--r--TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h1
-rw-r--r--TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl2
-rw-r--r--TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl2
-rw-r--r--TAO/tests/Bug_3506_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3506_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3513_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3513_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3514_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3514_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3524_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3524_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3524_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3531_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.h2
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.inl2
-rw-r--r--TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3531b_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3542_Regression/Bug_3542.mpc2
-rw-r--r--TAO/tests/Bug_3542_Regression/DllOrb.cpp2
-rw-r--r--TAO/tests/Bug_3542_Regression/DllOrb.h2
-rw-r--r--TAO/tests/Bug_3542_Regression/bug_3542_export.h1
-rw-r--r--TAO/tests/Bug_3542_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3543_Regression/master.cpp2
-rw-r--r--TAO/tests/Bug_3543_Regression/master.idl2
-rw-r--r--TAO/tests/Bug_3543_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest.idl2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest_i.cpp2
-rw-r--r--TAO/tests/Bug_3547_Regression/UDPTest_i.h2
-rw-r--r--TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3548_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3548_Regression/memeater.idl1
-rw-r--r--TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3552_Regression/check.cpp2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp2
-rw-r--r--TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp2
-rw-r--r--TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3558_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3558_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp2
-rw-r--r--TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc2
-rw-r--r--TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3574_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3575_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3597_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3630_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3632_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3632_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3636_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3636_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/Backend_Impl.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3647_Regression/Middle_Impl.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/backend_server.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3647_Regression/middle_server.cpp2
-rw-r--r--TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3674_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3674_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3676_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3676_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3683_Regression/Echo.idl2
-rw-r--r--TAO/tests/Bug_3683_Regression/Echo_i.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/Simple_util.cpp2
-rw-r--r--TAO/tests/Bug_3683_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3695_Regression/Bug_3695.cpp2
-rw-r--r--TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc1
-rw-r--r--TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3701_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3746_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3746_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3748_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3748_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/common.cpp2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/common.h2
-rw-r--r--TAO/tests/Bug_3755_Ext_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3755_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3766_Regression/Test.idl2
-rw-r--r--TAO/tests/Bug_3766_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3766_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3790_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/server2.cpp2
-rw-r--r--TAO/tests/Bug_3790_Regression/simple_test.idl2
-rw-r--r--TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3821_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3821_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3826_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3827_Regression/Message.idl2
-rw-r--r--TAO/tests/Bug_3827_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3837_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3837_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_inarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_inoutarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_outarg.idl2
-rw-r--r--TAO/tests/Bug_3845_Regression/local_rettype.idl2
-rw-r--r--TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/Hello_i.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_3853_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3853_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3896_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3896_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3896_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/Hello.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/Test2.idl2
-rw-r--r--TAO/tests/Bug_3919_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3919_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Bug_3926_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3926_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3926_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3941_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3941_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp1
-rw-r--r--TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc1
-rw-r--r--TAO/tests/Bug_3942_Regression/Foo.idl2
-rw-r--r--TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3953_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/client_i.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/client_i.h2
-rw-r--r--TAO/tests/Bug_3953_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/server_i.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/server_i.h2
-rw-r--r--TAO/tests/Bug_3953_Regression/test.idl1
-rw-r--r--TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc2
-rw-r--r--TAO/tests/Bug_3954_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_3954_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_3954_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc2
-rw-r--r--TAO/tests/Bug_4010_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_4010_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_4010_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc2
-rw-r--r--TAO/tests/Bug_4059_Regression/Hello.cpp1
-rw-r--r--TAO/tests/Bug_4059_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_4059_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp1
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl1
-rw-r--r--TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc1
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp2
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl2
-rw-r--r--TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc2
-rw-r--r--TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger.idl2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerClient.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerServer.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger_i.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/Messenger_i.h2
-rw-r--r--TAO/tests/CDR/CDR.mpc2
-rw-r--r--TAO/tests/COIOP/COIOP_Tests.mpc2
-rw-r--r--TAO/tests/COIOP/Client_Task.cpp2
-rw-r--r--TAO/tests/COIOP/Hello.cpp2
-rw-r--r--TAO/tests/COIOP/Server_Task.cpp2
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc2
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/server.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/CSD_Collocation.mpc2
-rw-r--r--TAO/tests/CSD_Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond.idl2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/CSD_Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp1
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp1
-rw-r--r--TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc2
-rw-r--r--TAO/tests/Cache_Growth_Test/client.cpp2
-rw-r--r--TAO/tests/Cache_Growth_Test/server.cpp2
-rw-r--r--TAO/tests/CallbackTest/CallbackTest.mpc2
-rw-r--r--TAO/tests/CallbackTest/client.cpp2
-rw-r--r--TAO/tests/CallbackTest/server.cpp2
-rw-r--r--TAO/tests/ClientPortSpan/ClientPortSpan.mpc2
-rw-r--r--TAO/tests/ClientPortSpan/Hello.cpp1
-rw-r--r--TAO/tests/ClientPortSpan/client.cpp2
-rw-r--r--TAO/tests/ClientPortSpan/server.cpp2
-rw-r--r--TAO/tests/Client_Leaks/Client_Leaks.mpc2
-rw-r--r--TAO/tests/Client_Leaks/child.cpp2
-rw-r--r--TAO/tests/Client_Leaks/client.cpp2
-rw-r--r--TAO/tests/Client_Leaks/server.cpp2
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h1
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp2
-rw-r--r--TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h1
-rw-r--r--TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc2
-rw-r--r--TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h1
-rw-r--r--TAO/tests/CodeSets/simple/CodeSets_simple.mpc2
-rw-r--r--TAO/tests/CodeSets/simple/simple.idl2
-rw-r--r--TAO/tests/Codec/Codec.mpc2
-rw-r--r--TAO/tests/Codec/client.cpp2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Hello.cpp2
-rw-r--r--TAO/tests/Collocated_DerivedIF/Test.idl2
-rw-r--r--TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Collocated_Forwarding/server.cpp2
-rw-r--r--TAO/tests/Collocated_Forwarding/test_i.cpp1
-rw-r--r--TAO/tests/Collocated_Forwarding/test_i.h2
-rw-r--r--TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc2
-rw-r--r--TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc2
-rw-r--r--TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc2
-rw-r--r--TAO/tests/Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/Collocation/Collocation.mpc2
-rw-r--r--TAO/tests/Collocation/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/Collocation/Diamond.idl2
-rw-r--r--TAO/tests/Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/Collocation/diamond_export.h1
-rw-r--r--TAO/tests/Collocation/stub_export.h1
-rw-r--r--TAO/tests/CollocationLockup/AB.idl2
-rw-r--r--TAO/tests/CollocationLockup/CollocationLockup.cpp2
-rw-r--r--TAO/tests/CollocationLockup/CollocationLockup.mpc2
-rw-r--r--TAO/tests/CollocationLockup/SimpleNamingService.cpp2
-rw-r--r--TAO/tests/CollocationLockup/SimpleNamingService.idl2
-rw-r--r--TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc2
-rw-r--r--TAO/tests/Collocation_Exception_Test/Server_Task.cpp1
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp1
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc2
-rw-r--r--TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp2
-rw-r--r--TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc2
-rw-r--r--TAO/tests/Collocation_Tests/Collocation_Tests.mpc2
-rw-r--r--TAO/tests/Compression/Compression_Test.mpc2
-rw-r--r--TAO/tests/Compression/RLECompressorTest.cpp2
-rw-r--r--TAO/tests/Compression/bzip2server.cpp2
-rw-r--r--TAO/tests/Compression/lzoserver.cpp2
-rw-r--r--TAO/tests/Compression/zlibserver.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc2
-rw-r--r--TAO/tests/Connect_Strategy_Test/client.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/server.cpp2
-rw-r--r--TAO/tests/Connection_Failure/Connection_Failure.mpc2
-rw-r--r--TAO/tests/Connection_Failure/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/Connection_Purging.mpc2
-rw-r--r--TAO/tests/Connection_Purging/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Connection_Purging/test.idl2
-rw-r--r--TAO/tests/Connection_Timeout/Connection_Timeout.mpc2
-rw-r--r--TAO/tests/Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/Crash_On_Write.mpc2
-rw-r--r--TAO/tests/Crash_On_Write/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/server.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/Crashed_Callback.mpc2
-rw-r--r--TAO/tests/Crashed_Callback/client.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/server.cpp2
-rw-r--r--TAO/tests/DII_AMI_Forward/server_interceptor.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc2
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc2
-rw-r--r--TAO/tests/DIOP/Basic.mpc2
-rw-r--r--TAO/tests/DIOP/UDP.idl2
-rw-r--r--TAO/tests/DIOP/UDP_Client_i.cpp2
-rw-r--r--TAO/tests/DIOP/UDP_i.cpp2
-rw-r--r--TAO/tests/DLL_ORB/DLL_ORB.mpc2
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module.cpp2
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module_Export.h1
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module.cpp2
-rw-r--r--TAO/tests/DLL_ORB/Test_Server_Module_Export.h1
-rw-r--r--TAO/tests/DLL_ORB/Test_i.cpp2
-rw-r--r--TAO/tests/DSI_AMH/DSI_AMH.mpc2
-rw-r--r--TAO/tests/DSI_AMH/client.cpp2
-rw-r--r--TAO/tests/DSI_AMH/server.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_dsi.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_dsi.inl2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_i.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/test_i.inl2
-rw-r--r--TAO/tests/DSI_Gateway/DSI_Gateway.mpc2
-rw-r--r--TAO/tests/DSI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_dsi.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_dsi.inl2
-rw-r--r--TAO/tests/DSI_Gateway/test_i.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/test_i.inl2
-rw-r--r--TAO/tests/DiffServ/client.cpp2
-rw-r--r--TAO/tests/DiffServ/diffserv.mpc2
-rw-r--r--TAO/tests/DiffServ/server.cpp2
-rw-r--r--TAO/tests/DynAny_Test/DynAny_Test.mpc2
-rw-r--r--TAO/tests/DynUnion_Test/DynUnionTest.cpp2
-rw-r--r--TAO/tests/DynUnion_Test/dynany.idl2
-rw-r--r--TAO/tests/DynUnion_Test/dynunion_test.mpc2
-rw-r--r--TAO/tests/DynValue_Test/Analyzer.cpp2
-rw-r--r--TAO/tests/DynValue_Test/Analyzer.h2
-rw-r--r--TAO/tests/DynValue_Test/DynValue_Test.idl2
-rw-r--r--TAO/tests/DynValue_Test/DynValue_Test.mpc2
-rw-r--r--TAO/tests/DynValue_Test/ValueTypes_impl.cpp2
-rw-r--r--TAO/tests/DynValue_Test/ValueTypes_impl.h2
-rw-r--r--TAO/tests/DynValue_Test/main.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/Config_Loader/Test.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Test.cpp2
-rw-r--r--TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc2
-rw-r--r--TAO/tests/Explicit_Event_Loop/time.idl2
-rw-r--r--TAO/tests/Exposed_Policies/Exposed_Policies.mpc2
-rw-r--r--TAO/tests/Exposed_Policies/Policy_Tester.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/Policy_Verifier.cpp1
-rw-r--r--TAO/tests/Exposed_Policies/client.cpp2
-rw-r--r--TAO/tests/FL_Cube/FL_Cube.mpc2
-rw-r--r--TAO/tests/FL_Cube/client.cpp1
-rw-r--r--TAO/tests/FL_Cube/server.cpp2
-rw-r--r--TAO/tests/FL_Cube/test_i.cpp2
-rw-r--r--TAO/tests/Faults/Faults.mpc2
-rw-r--r--TAO/tests/Faults/client.cpp2
-rw-r--r--TAO/tests/Faults/middle.cpp2
-rw-r--r--TAO/tests/Faults/ping.cpp2
-rw-r--r--TAO/tests/Faults/ping.idl2
-rw-r--r--TAO/tests/Faults/ping_i.cpp2
-rw-r--r--TAO/tests/Faults/ping_i.inl2
-rw-r--r--TAO/tests/Faults/pong.cpp2
-rw-r--r--TAO/tests/Faults/server.cpp2
-rw-r--r--TAO/tests/Faults/test_i.cpp2
-rw-r--r--TAO/tests/Faults/test_i.inl2
-rw-r--r--TAO/tests/File_IO/File_IO.mpc2
-rw-r--r--TAO/tests/File_IO/server.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/client.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/server.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test.idl2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test_i.cpp2
-rwxr-xr-xTAO/tests/ForwardOnceUponException/test_i.inl1
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/client.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/server.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test.idl2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test_i.cpp2
-rwxr-xr-xTAO/tests/ForwardUponObjectNotExist/test_i.inl2
-rw-r--r--TAO/tests/Forwarding/Forwarding.mpc2
-rw-r--r--TAO/tests/Forwarding/client.cpp2
-rw-r--r--TAO/tests/Forwarding/server.cpp2
-rw-r--r--TAO/tests/Forwarding/test.idl2
-rw-r--r--TAO/tests/Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/Forwarding/test_i.inl2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc2
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp2
-rw-r--r--TAO/tests/HandleExhaustion/HandleExhaustion.mpc2
-rw-r--r--TAO/tests/HandleExhaustion/Test.idl2
-rw-r--r--TAO/tests/HandleExhaustion/client.cpp2
-rw-r--r--TAO/tests/HandleExhaustion/server.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/Hang.mpc2
-rw-r--r--TAO/tests/Hang_Shutdown/Test.idl2
-rw-r--r--TAO/tests/Hang_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Hello/Hello.cpp1
-rw-r--r--TAO/tests/Hello/Hello.mpc2
-rw-r--r--TAO/tests/Hello/client.cpp2
-rw-r--r--TAO/tests/Hello/server.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/Hello.mpc2
-rw-r--r--TAO/tests/ICMG_Any_Bug/client.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/server.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/client.cpp2
-rw-r--r--TAO/tests/IDL_Inherited_Operation/server.cpp2
-rw-r--r--TAO/tests/IDL_Test/Bug_2350_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2577_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2582_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2583_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2616_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_2619_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3243_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3312_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3819_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/Bug_3821_Regression.idl2
-rw-r--r--TAO/tests/IDL_Test/IDL_Test.mpc2
-rw-r--r--TAO/tests/IDL_Test/PEMNaming.idl2
-rw-r--r--TAO/tests/IDL_Test/attribute.idl2
-rw-r--r--TAO/tests/IDL_Test/loader_const.idl2
-rw-r--r--TAO/tests/IDL_Test/struct.idl1
-rw-r--r--TAO/tests/IDL_Test/typeprefix.idl2
-rw-r--r--TAO/tests/IORManipulation/IORManipulation.mpc2
-rw-r--r--TAO/tests/IORManipulation/IORTest.cpp2
-rw-r--r--TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc2
-rw-r--r--TAO/tests/IORManipulation/filter/Test.idl1
-rw-r--r--TAO/tests/IORManipulation/filter/server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/Test.mpc2
-rw-r--r--TAO/tests/IORTable_Locator/async_server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/client.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/server.cpp2
-rw-r--r--TAO/tests/IORTable_Locator/simple_test.idl2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp1
-rw-r--r--TAO/tests/IPV6/IPV6_Hello.mpc2
-rw-r--r--TAO/tests/IPV6/client.cpp2
-rw-r--r--TAO/tests/IPV6/server.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_i.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_client.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_server.cpp1
-rw-r--r--TAO/tests/InterOp-Naming/InterOp-Naming.mpc2
-rw-r--r--TAO/tests/Leader_Followers/Leader_Followers.mpc2
-rw-r--r--TAO/tests/Leader_Followers/server.cpp2
-rw-r--r--TAO/tests/Leader_Followers/test_i.cpp2
-rw-r--r--TAO/tests/LongDouble/Global.h1
-rw-r--r--TAO/tests/LongDouble/LongDoubleTest.cpp2
-rw-r--r--TAO/tests/LongDouble/LongDoubleTest.mpc2
-rw-r--r--TAO/tests/LongDouble/client.cpp2
-rw-r--r--TAO/tests/LongDouble/server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.h2
-rw-r--r--TAO/tests/LongUpcalls/Controller.h2
-rw-r--r--TAO/tests/LongUpcalls/LongUpcalls.mpc2
-rw-r--r--TAO/tests/LongUpcalls/Test.idl2
-rw-r--r--TAO/tests/LongUpcalls/ami_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/ami_server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_server.cpp2
-rw-r--r--TAO/tests/MProfile/MProfile.mpc2
-rw-r--r--TAO/tests/MProfile/client.cpp2
-rw-r--r--TAO/tests/MProfile/server.cpp2
-rw-r--r--TAO/tests/MProfile/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/server.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc2
-rw-r--r--TAO/tests/MProfile_Forwarding/client.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/server.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/test_i.inl2
-rw-r--r--TAO/tests/MT_BiDir/MT_BiDir.mpc2
-rw-r--r--TAO/tests/MT_BiDir/Sender_i.cpp2
-rw-r--r--TAO/tests/MT_BiDir/client.cpp2
-rw-r--r--TAO/tests/MT_BiDir/server.cpp2
-rw-r--r--TAO/tests/MT_Client/MT_Client.mpc2
-rw-r--r--TAO/tests/MT_Client/client.cpp2
-rw-r--r--TAO/tests/MT_Client/orb_creation.cpp2
-rw-r--r--TAO/tests/MT_Client/server.cpp2
-rw-r--r--TAO/tests/MT_Client/test_i.cpp2
-rw-r--r--TAO/tests/MT_Client/test_i.inl2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/chatter.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/client.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/police.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/police.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/server.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Client_Leader/worker.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/client.cpp2
-rw-r--r--TAO/tests/MT_NoUpcall_Connect/server.cpp2
-rw-r--r--TAO/tests/MT_Server/MT_Server.mpc2
-rw-r--r--TAO/tests/MT_Server/client.cpp2
-rw-r--r--TAO/tests/MT_Server/server.cpp2
-rw-r--r--TAO/tests/MT_Server/test_i.cpp2
-rw-r--r--TAO/tests/MT_Server/test_i.inl2
-rw-r--r--TAO/tests/MT_Timeout/MT_Timeout.mpc2
-rw-r--r--TAO/tests/MT_Timeout/client.cpp2
-rw-r--r--TAO/tests/MT_Timeout/server.cpp2
-rw-r--r--TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/client.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/server.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test.idl2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test_i.cpp2
-rw-r--r--TAO/tests/Monitor/Marshal_Buffer/test_i.h2
-rw-r--r--TAO/tests/Multiple/Collocation_Tester.cpp2
-rw-r--r--TAO/tests/Multiple/Multiple.mpc2
-rw-r--r--TAO/tests/Multiple/client.cpp2
-rw-r--r--TAO/tests/Multiple/server.cpp2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc2
-rw-r--r--TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h2
-rw-r--r--TAO/tests/Multiple_Inheritance/server.cpp2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp1
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp2
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl2
-rwxr-xr-xTAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/client.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/server.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/test_i.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/test_i.inl2
-rw-r--r--TAO/tests/Muxing/Muxing.mpc2
-rw-r--r--TAO/tests/Muxing/client.cpp2
-rw-r--r--TAO/tests/Muxing/server.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/Native_Exceptions.mpc2
-rw-r--r--TAO/tests/Native_Exceptions/client.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/server.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/test_i.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/test_i.inl2
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc2
-rw-r--r--TAO/tests/NestedUpcall/Simple/Simple.mpc2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client_i.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server_i.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Simple/simple-client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/TT.mpc2
-rw-r--r--TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc2
-rw-r--r--TAO/tests/Nested_Event_Loop/client.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/server.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/test_i.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/test_i.h2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/client.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/scavenger.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/server.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/client.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/server.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/test_i.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/test_i.h2
-rw-r--r--TAO/tests/OBV/Any/AnyS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Any/OBV_Any.mpc2
-rw-r--r--TAO/tests/OBV/Any/client.cpp2
-rw-r--r--TAO/tests/OBV/Any/server.cpp2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeBase.idl2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeController.idl2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/TreeNode.idl2
-rw-r--r--TAO/tests/OBV/Factory/Factory.idl2
-rw-r--r--TAO/tests/OBV/Factory/FactoryC_impl.cpp2
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Factory/OBV_Factory.mpc2
-rw-r--r--TAO/tests/OBV/Factory/client.cpp2
-rw-r--r--TAO/tests/OBV/Factory/server.cpp2
-rw-r--r--TAO/tests/OBV/Forward/OBV_Forward.mpc2
-rw-r--r--TAO/tests/OBV/Forward/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/Forward/TreeBase.idl2
-rw-r--r--TAO/tests/OBV/Forward/TreeController.idl2
-rw-r--r--TAO/tests/OBV/Forward/TreeNode.idl2
-rw-r--r--TAO/tests/OBV/Forward/client.cpp2
-rw-r--r--TAO/tests/OBV/Forward/server.cpp2
-rwxr-xr-xTAO/tests/OBV/Indirection/Factory.cpp1
-rwxr-xr-xTAO/tests/OBV/Indirection/Factory.h1
-rw-r--r--TAO/tests/OBV/Indirection/Indirection.mpc2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger.idl2
-rw-r--r--TAO/tests/OBV/Indirection/MessengerClient.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/MessengerServer.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger_i.cpp2
-rw-r--r--TAO/tests/OBV/Indirection/Messenger_i.h2
-rw-r--r--TAO/tests/OBV/Simple/OBV.idl2
-rw-r--r--TAO/tests/OBV/Simple/OBV_Simple.mpc2
-rw-r--r--TAO/tests/OBV/Simple/OBV_impl.cpp2
-rw-r--r--TAO/tests/OBV/Simple/OBV_impl.h2
-rw-r--r--TAO/tests/OBV/Simple/Server_i.cpp2
-rw-r--r--TAO/tests/OBV/Simple/Simple_util.cpp2
-rw-r--r--TAO/tests/OBV/Simple/server.cpp1
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test.idl2
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test.mpc2
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test_impl.cpp1
-rw-r--r--TAO/tests/OBV/Supports/Supports_Test_impl.h2
-rw-r--r--TAO/tests/OBV/Supports/client.cpp2
-rw-r--r--TAO/tests/OBV/Supports/server.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc2
-rw-r--r--TAO/tests/OBV/TC_Alignment/client.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/server.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/test_i.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/Extra.idl2
-rw-r--r--TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc2
-rw-r--r--TAO/tests/OBV/Truncatable/Truncatable.idl2
-rw-r--r--TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/client.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/server.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/Test_impl.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/client.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/server.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/valuebox.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/valuebox.mpc2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_basic.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_struct.idl2
-rw-r--r--TAO/tests/OBV/ValueBox/vb_union.idl2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp1
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp1
-rw-r--r--TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Bunch/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Separation/Separation.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Separation/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Shared/Shared.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Shared/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Simple/Simple.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Simple/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h1
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h2
-rw-r--r--TAO/tests/ORB_destroy/ORB_destroy.mpc2
-rw-r--r--TAO/tests/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/ORB_init/ORB_init.mpc2
-rw-r--r--TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc2
-rw-r--r--TAO/tests/ORB_init/Portspan/server.cpp2
-rw-r--r--TAO/tests/ORB_init/Portspan/simple.idl2
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.cpp2
-rw-r--r--TAO/tests/ORB_shutdown/Foo_Bar.mpc2
-rw-r--r--TAO/tests/ORB_shutdown/server.cpp2
-rw-r--r--TAO/tests/ORT/ORT.mpc2
-rw-r--r--TAO/tests/ORT/ORT_test_IORInterceptor.cpp2
-rw-r--r--TAO/tests/ORT/ORT_test_i.cpp2
-rw-r--r--TAO/tests/ORT/ObjectReferenceFactory.cpp2
-rw-r--r--TAO/tests/ORT/ServerORBInitializer.cpp2
-rw-r--r--TAO/tests/ORT/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/tests/ORT/client.cpp2
-rw-r--r--TAO/tests/ORT/server.cpp2
-rw-r--r--TAO/tests/Object_Loader/Loader.cpp2
-rw-r--r--TAO/tests/Object_Loader/OLT_Export.h1
-rw-r--r--TAO/tests/Object_Loader/Object_Loader.mpc2
-rw-r--r--TAO/tests/Object_Loader/Test.idl2
-rw-r--r--TAO/tests/Object_Loader/Test_i.cpp2
-rw-r--r--TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc2
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.mpc2
-rw-r--r--TAO/tests/OctetSeq/client.cpp2
-rw-r--r--TAO/tests/OctetSeq/server.cpp2
-rw-r--r--TAO/tests/OctetSeq/test_i.cpp2
-rw-r--r--TAO/tests/OctetSeq/test_i.inl2
-rw-r--r--TAO/tests/Ondemand_Write/Hello.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/Ondemand_Write.mpc2
-rw-r--r--TAO/tests/Ondemand_Write/client.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/server.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc2
-rw-r--r--TAO/tests/Oneway_Buffering/admin.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/client.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/server.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/ORB_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server_Task.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test.idl2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.cpp2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Test_i.h2
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/main.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/Test.idl2
-rw-r--r--TAO/tests/Oneway_Timeouts/client.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/server.cpp2
-rw-r--r--TAO/tests/Oneway_Timeouts/test.mpc2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/client.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/server.cpp2
-rw-r--r--TAO/tests/Optimized_Connection/Optimized_Connection.mpc2
-rw-r--r--TAO/tests/Optimized_Connection/oc_client.cpp2
-rw-r--r--TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/client.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/server.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/test_i.cpp2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/test.idl2
-rw-r--r--TAO/tests/POA/Current/Current.mpc2
-rw-r--r--TAO/tests/POA/DSI/Database.idl2
-rw-r--r--TAO/tests/POA/DSI/Database_i.cpp2
-rw-r--r--TAO/tests/POA/DSI/Database_i.h2
-rw-r--r--TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc2
-rw-r--r--TAO/tests/POA/Deactivate_Object/server.cpp2
-rw-r--r--TAO/tests/POA/Default_Servant/Default_Servant.mpc2
-rw-r--r--TAO/tests/POA/Default_Servant/test.idl2
-rw-r--r--TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc2
-rw-r--r--TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc2
-rw-r--r--TAO/tests/POA/EndpointPolicy/client.cpp2
-rw-r--r--TAO/tests/POA/EndpointPolicy/server.cpp2
-rw-r--r--TAO/tests/POA/Etherealization/Etherealization.mpc2
-rw-r--r--TAO/tests/POA/Etherealization/test.idl2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/test.idl2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp2
-rw-r--r--TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h2
-rw-r--r--TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc2
-rw-r--r--TAO/tests/POA/FindPOA/Adapter_Activator.cpp2
-rw-r--r--TAO/tests/POA/FindPOA/POA_FindPOA.mpc2
-rw-r--r--TAO/tests/POA/Forwarding/POA_Forwarding.mpc2
-rw-r--r--TAO/tests/POA/Forwarding/Servant_Activator.cpp2
-rw-r--r--TAO/tests/POA/Forwarding/test.idl2
-rw-r--r--TAO/tests/POA/Forwarding/test_i.cpp2
-rw-r--r--TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc1
-rw-r--r--TAO/tests/POA/Generic_Servant/client.cpp2
-rw-r--r--TAO/tests/POA/Generic_Servant/generic_servant_export.h1
-rw-r--r--TAO/tests/POA/Generic_Servant/test.idl2
-rw-r--r--TAO/tests/POA/Generic_Servant/test_i.cpp2
-rw-r--r--TAO/tests/POA/Identity/Identity.mpc2
-rw-r--r--TAO/tests/POA/Identity/test.idl2
-rw-r--r--TAO/tests/POA/Loader/POA_Loader.mpc1
-rw-r--r--TAO/tests/POA/Loader/Server_Manager.cpp2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/test.idl2
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc2
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl2
-rw-r--r--TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc2
-rw-r--r--TAO/tests/POA/Non_Retain_System_Id/test.idl2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/test.idl2
-rw-r--r--TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc2
-rw-r--r--TAO/tests/POA/Object_Reactivation/test.idl2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl2
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp2
-rw-r--r--TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc2
-rw-r--r--TAO/tests/POA/POA_BiDir/POA_BiDir.mpc2
-rw-r--r--TAO/tests/POA/POA_Destruction/POA_Destruction.mpc2
-rw-r--r--TAO/tests/POA/POA_Destruction/test.idl2
-rw-r--r--TAO/tests/POA/Persistent_ID/Persistent_ID.mpc2
-rw-r--r--TAO/tests/POA/Persistent_ID/test.idl2
-rw-r--r--TAO/tests/POA/Policies/Policies.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counting/Reference_Counting.mpc2
-rw-r--r--TAO/tests/POA/Reference_Counting/test.cpp2
-rw-r--r--TAO/tests/POA/RootPOA/RootPOA.mpc2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/test.idl2
-rw-r--r--TAO/tests/POA/TIE/POA_TIE.mpc2
-rw-r--r--TAO/tests/POA/TIE/test.idl2
-rw-r--r--TAO/tests/POA/wait_for_completion/test.idl2
-rw-r--r--TAO/tests/POA/wait_for_completion/wait_for_completion.mpc2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/client.cpp2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/server.cpp2
-rw-r--r--TAO/tests/Param_Test/Param_Test.mpc2
-rw-r--r--TAO/tests/Permanent_Forward/Permanent_Forward.mpc2
-rw-r--r--TAO/tests/Permanent_Forward/StubTest.cpp2
-rw-r--r--TAO/tests/Policies/Manipulation.cpp2
-rw-r--r--TAO/tests/Policies/Policies.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc1
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/marker.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/marker.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h1
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/test.idl2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc2
-rw-r--r--TAO/tests/Portable_Interceptors/Slot/driver.cpp2
-rw-r--r--TAO/tests/QtTests/QtTests.mpc2
-rw-r--r--TAO/tests/QtTests/client.cpp2
-rw-r--r--TAO/tests/QtTests/server.cpp2
-rw-r--r--TAO/tests/QtTests/test.idl2
-rw-r--r--TAO/tests/QtTests/test_i.cpp2
-rw-r--r--TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp2
-rw-r--r--TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc2
-rw-r--r--TAO/tests/RTCORBA/Collocation/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/test.idl2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Policies/Policies.mpc2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/test.idl2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl2
-rw-r--r--TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc2
-rw-r--r--TAO/tests/RTCORBA/RTMutex/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/test_i.cpp2
-rw-r--r--TAO/tests/RTCORBA/check_supported_priorities.cpp2
-rw-r--r--TAO/tests/RTCORBA/common_args.cpp2
-rw-r--r--TAO/tests/RTScheduling/Current/Current.mpc2
-rw-r--r--TAO/tests/RTScheduling/Current/Thread_Task.cpp2
-rw-r--r--TAO/tests/RTScheduling/Current/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc2
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/VoidData/VoidData.mpc2
-rw-r--r--TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc2
-rw-r--r--TAO/tests/Reliable_Oneways/client.cpp2
-rw-r--r--TAO/tests/Reliable_Oneways/server.cpp2
-rw-r--r--TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/test_macros.h2
-rw-r--r--TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc2
-rw-r--r--TAO/tests/Servant_To_Reference_Test/server.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc2
-rw-r--r--TAO/tests/Server_Connection_Purging/Test.idl2
-rw-r--r--TAO/tests/Server_Connection_Purging/client.cpp1
-rw-r--r--TAO/tests/Server_Connection_Purging/client2.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Server_Leaks/Server_Leaks.mpc2
-rw-r--r--TAO/tests/Server_Leaks/client.cpp2
-rw-r--r--TAO/tests/Server_Leaks/server.cpp2
-rw-r--r--TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc2
-rw-r--r--TAO/tests/Server_Port_Zero/server.cpp2
-rw-r--r--TAO/tests/Single_Read/Single_Read.mpc2
-rw-r--r--TAO/tests/Single_Read/client.cpp2
-rw-r--r--TAO/tests/Single_Read/server.cpp2
-rw-r--r--TAO/tests/Single_Read/test_i.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/client.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/interface_3_i.cpp1
-rw-r--r--TAO/tests/Skeleton_Inheritance/server.cpp2
-rw-r--r--TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Diamond_i.h2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/diamond_export.h1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/main.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/stub_export.h1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/test.idl2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxies.mpc2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h2
-rw-r--r--TAO/tests/Smart_Proxies/test.idl2
-rw-r--r--TAO/tests/Stack_Recursion/Stack_Recursion.mpc2
-rw-r--r--TAO/tests/Stack_Recursion/client.cpp2
-rw-r--r--TAO/tests/Stack_Recursion/server.cpp2
-rw-r--r--TAO/tests/Storable/Savable.cpp2
-rw-r--r--TAO/tests/Storable/Savable.h2
-rw-r--r--TAO/tests/Storable/Storable.mpc2
-rw-r--r--TAO/tests/Storable/test.cpp2
-rw-r--r--TAO/tests/Strategies/Strategies.mpc2
-rw-r--r--TAO/tests/Strategies/client.cpp2
-rw-r--r--TAO/tests/Strategies/server.cpp2
-rw-r--r--TAO/tests/Strategies/simple_test_i.cpp2
-rw-r--r--TAO/tests/Strategies/simple_test_i.inl2
-rw-r--r--TAO/tests/Time_Policy/Time_Policy.mpc2
-rw-r--r--TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc2
-rw-r--r--TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp2
-rw-r--r--TAO/tests/Time_Policy_Custom/TPTest_Export.h1
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/server.cpp2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/test_i.cpp2
-rw-r--r--TAO/tests/Timeout/Timeout.mpc2
-rw-r--r--TAO/tests/Timeout/client.cpp2
-rw-r--r--TAO/tests/Timeout/server.cpp2
-rw-r--r--TAO/tests/Timeout/test_i.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Framework.mpc2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Server_Main.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/Tester.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/client.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/server.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/simple.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP.mpc2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/client.cpp2
-rw-r--r--TAO/tests/TransportCurrent/IIOP/server.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Current_Test_Export.h1
-rw-r--r--TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc2
-rw-r--r--TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp2
-rw-r--r--TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp1
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp2
-rw-r--r--TAO/tests/Transport_Cache_Manager/TCM.mpc2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_ps.h2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_tdi.h2
-rw-r--r--TAO/tests/Transport_Cache_Manager/mock_transport.h2
-rw-r--r--TAO/tests/Two_Objects/Second_i.cpp2
-rw-r--r--TAO/tests/Two_Objects/Two_Objects.mpc2
-rw-r--r--TAO/tests/Two_Objects/client.cpp2
-rw-r--r--TAO/tests/Two_Objects/server.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/client.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/server.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/test.idl2
-rw-r--r--TAO/tests/Typedef_String_Array/testImpl.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/testImpl.h2
-rw-r--r--TAO/tests/Typedef_String_Array/typedef_string_array.mpc2
-rw-r--r--TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc2
-rw-r--r--TAO/tests/UNKNOWN_Exception/client.cpp2
-rw-r--r--TAO/tests/UNKNOWN_Exception/server.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Control.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc2
-rw-r--r--TAO/tests/Xt_Stopwatch/client.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/server.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/test.idl2
-rw-r--r--TAO/tests/Xt_Stopwatch/test_i.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp2
-rw-r--r--TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h1
-rw-r--r--TAO/tests/ZIOP/ZIOP.mpc2
-rw-r--r--TAO/tests/ZIOP/client.cpp2
-rw-r--r--TAO/tests/ZIOP/common.h2
-rw-r--r--TAO/tests/ZIOP/server.cpp2
-rw-r--r--TAO/tests/objref_comparison_test/foo.idl2
-rw-r--r--TAO/tests/objref_comparison_test/main.cpp2
-rw-r--r--TAO/tests/objref_comparison_test/objref_comparison_test.mpc2
-rw-r--r--TAO/utils/NamingViewer/AddNameServerDlg.cpp2
-rw-r--r--TAO/utils/NamingViewer/AddNameServerDlg.h1
-rw-r--r--TAO/utils/NamingViewer/BindDialog.cpp2
-rw-r--r--TAO/utils/NamingViewer/BindDialog.h1
-rw-r--r--TAO/utils/NamingViewer/BindNewContext.cpp1
-rw-r--r--TAO/utils/NamingViewer/BindNewContext.h1
-rw-r--r--TAO/utils/NamingViewer/NamingObject.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingObject.h1
-rw-r--r--TAO/utils/NamingViewer/NamingTreeCtrl.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingTreeCtrl.h1
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.h1
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.mpc2
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.h1
-rw-r--r--TAO/utils/NamingViewer/SelectNSDialog.cpp1
-rw-r--r--TAO/utils/NamingViewer/SelectNSDialog.h1
-rw-r--r--TAO/utils/NamingViewer/StdAfx.cpp1
-rw-r--r--TAO/utils/NamingViewer/StdAfx.h1
-rw-r--r--TAO/utils/NamingViewer/ViewIORDialog.cpp2
-rw-r--r--TAO/utils/NamingViewer/ViewIORDialog.h1
-rw-r--r--TAO/utils/NamingViewer/resource.h1
-rw-r--r--TAO/utils/catior/catior.cpp2
-rw-r--r--TAO/utils/catior/catior.mpc2
-rw-r--r--TAO/utils/catior/catior_export.h1
-rw-r--r--TAO/utils/logWalker/GIOP_Buffer.cpp2
-rw-r--r--TAO/utils/logWalker/GIOP_Buffer.h1
-rw-r--r--TAO/utils/logWalker/HostProcess.cpp2
-rw-r--r--TAO/utils/logWalker/HostProcess.h1
-rw-r--r--TAO/utils/logWalker/Invocation.cpp2
-rw-r--r--TAO/utils/logWalker/Invocation.h1
-rw-r--r--TAO/utils/logWalker/Log.cpp2
-rw-r--r--TAO/utils/logWalker/Log.h1
-rw-r--r--TAO/utils/logWalker/PeerObject.cpp2
-rw-r--r--TAO/utils/logWalker/PeerObject.h1
-rw-r--r--TAO/utils/logWalker/PeerProcess.cpp2
-rw-r--r--TAO/utils/logWalker/PeerProcess.h1
-rw-r--r--TAO/utils/logWalker/Session.cpp2
-rw-r--r--TAO/utils/logWalker/Session.h1
-rw-r--r--TAO/utils/logWalker/Thread.cpp2
-rw-r--r--TAO/utils/logWalker/Thread.h1
-rw-r--r--TAO/utils/logWalker/logWalker.cpp2
-rw-r--r--TAO/utils/logWalker/logWalker.mpc2
-rw-r--r--TAO/utils/monitor/monitor.mpc2
-rw-r--r--TAO/utils/monitor/monitor_client.cpp2
-rw-r--r--TAO/utils/nsgroup/nsgroup.mpc2
-rw-r--r--TAO/utils/nslist/nslist.mpc2
-rw-r--r--TAO/utils/wxNamingViewer/pch.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxAddNameServerDlg.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxAutoDialog.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxBindDialog.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxBindNewContext.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingObject.cpp1
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingObject.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingTree.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewer.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewer.mpc2
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewerFrame.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxSelectNSDialog.h1
-rw-r--r--TAO/utils/wxNamingViewer/wxViewIORDialog.h1
5366 files changed, 2 insertions, 10069 deletions
diff --git a/TAO/DevGuideExamples/AMH/AMH.mpc b/TAO/DevGuideExamples/AMH/AMH.mpc
index c18e3368bb1..299504deaae 100644
--- a/TAO/DevGuideExamples/AMH/AMH.mpc
+++ b/TAO/DevGuideExamples/AMH/AMH.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, amh {
idlflags += -Wb,pch_include=amh_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/AMH/Messenger.idl b/TAO/DevGuideExamples/AMH/Messenger.idl
index 55d4aba1c5e..b307589b231 100644
--- a/TAO/DevGuideExamples/AMH/Messenger.idl
+++ b/TAO/DevGuideExamples/AMH/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
module DevGuide
diff --git a/TAO/DevGuideExamples/AMH/MessengerClient.cpp b/TAO/DevGuideExamples/AMH/MessengerClient.cpp
index c6145c5bad4..ed1b5ca729f 100644
--- a/TAO/DevGuideExamples/AMH/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/AMH/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_pch.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/AMH/MessengerServer.cpp b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
index ae8fb522e47..0ff76911638 100644
--- a/TAO/DevGuideExamples/AMH/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/AMH/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_pch.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/AMH/amh_pch.cpp b/TAO/DevGuideExamples/AMH/amh_pch.cpp
index 1217d4e0504..ab632ec71cb 100644
--- a/TAO/DevGuideExamples/AMH/amh_pch.cpp
+++ b/TAO/DevGuideExamples/AMH/amh_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "amh_pch.h"
diff --git a/TAO/DevGuideExamples/AMH/amh_pch.h b/TAO/DevGuideExamples/AMH/amh_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/AMH/amh_pch.h
+++ b/TAO/DevGuideExamples/AMH/amh_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
index 1f9756ac1ee..256f03cbbdb 100644
--- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
+++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, amh, ami {
idlflags += -Wb,pch_include=amh_ami_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
index 4931b9c9efe..b7aa56c8c40 100644
--- a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "amh_ami_pch.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
+++ b/TAO/DevGuideExamples/AMH_AMI/amh_ami_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/client.cpp b/TAO/DevGuideExamples/AMH_AMI/client.cpp
index d5912c43c4f..3a52873f2e0 100644
--- a/TAO/DevGuideExamples/AMH_AMI/client.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "ace/Get_Opt.h"
#include "middleC.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner.idl b/TAO/DevGuideExamples/AMH_AMI/inner.idl
index 7e0b6693b96..77a86167084 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner.idl
+++ b/TAO/DevGuideExamples/AMH_AMI/inner.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// file: inner.idl
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
index 68f7bb4b63c..6ce5e712976 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "inner_cb.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
index 92745ba5001..1c5da919e7b 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.h
@@ -1,5 +1,3 @@
-// $Id$
-
// -*- C++ -*-
#ifndef INNER_CB_H
#define INNER_CB_H
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
index e9dfe2f872e..739ee5c0da2 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "inner_i.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle.idl b/TAO/DevGuideExamples/AMH_AMI/middle.idl
index a81f96ee214..eb15857ba67 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle.idl
+++ b/TAO/DevGuideExamples/AMH_AMI/middle.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// file: middle.idl
interface Middle
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
index ede0bac8250..42a638c4fed 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "amh_ami_pch.h"
#include "middle_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
index 65fd05368de..5d4e0a05f11 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/BiDirectionalGIOP.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,pch_include=bidir_giop_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
index 81730edc1f9..570337d5803 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "bidir_giop_pch.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
index 9b28ecbd8ad..cc3b7dd664f 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/bidir_giop_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BIDIR_GIOP_PCH_H
#define BIDIR_GIOP_PCH_H
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl b/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
index b36b1182bde..ddb989750a2 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Callback
{
// A safe way to shutdown the client, using either clean shutdowns
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
index 25dee372b33..91143969b3c 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "callback_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
index b7623dd1829..dc70a79ed39 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/callback_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CALLBACKI_H_
#define CALLBACKI_H_
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
index 369dc556de1..5b1167b9622 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "callback_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
index 617a933d85d..ad4b3224ab9 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "simple_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl b/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
index cb98b3cadeb..e6ef4fffa86 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "callback.idl"
interface Simple
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
index e93e0e8b78b..32c5f1c39b4 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bidir_giop_pch.h"
#include "simple_i.h"
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
index 8d6c0aecc40..614ccafecda 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLEI_H_
#define SIMPLEI_H_
diff --git a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
index 40b2da5838d..71a0bbef8be 100644
--- a/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
+++ b/TAO/DevGuideExamples/GettingStarted/GettingStarted.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,pch_include=started_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger.idl b/TAO/DevGuideExamples/GettingStarted/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger.idl
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
index 3f41a9b2e3b..6f0c98be0d0 100644
--- a/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
index 057681e8ad7..a02b63f384b 100644
--- a/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/started_pch.cpp b/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
index c2c8b943b32..c7253a683cd 100644
--- a/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/started_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "started_pch.h"
diff --git a/TAO/DevGuideExamples/GettingStarted/started_pch.h b/TAO/DevGuideExamples/GettingStarted/started_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/GettingStarted/started_pch.h
+++ b/TAO/DevGuideExamples/GettingStarted/started_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
index c081d4e7d6c..da899e4aebe 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
local interface Messenger
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
index df7e7ecddd0..2489e6d0d38 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(LocalObject*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
index ca25998b65b..dca6a836668 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
int ACE_TMAIN (int, ACE_TCHAR **)
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 9c3f7306a6f..24eb1aab429 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index 92d6825db32..cb0454e8fdc 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
index 63a282a1850..d8d928a1c07 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
index 8eb8b435997..9519691d282 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
index 876fc1e4ac3..a3bb99603c0 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerLocator_i.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
index ba0da517de5..a1d9ade73dd 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_LOCATOR_I_H
#define MESSENGER_LOCATOR_I_H
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
index 8cb1f57ff63..b15baad88cb 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerLocator_i.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
index e1b7628f933..37814e75278 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/ServantLocator.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
index ed176d4530e..cdebd195ec1 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/AMIcallback.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): messaging, taoexe, portableserver, ami {
Source_Files {
Messenger_i.cpp
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
index 6488044fc67..58a5793b28b 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
exception MessengerUnableToSendMessage
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
index d2cd1ef0502..0bb8b9d3a8d 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "MessengerHandler.h"
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 60c8dac7e12..0b0ab15cd8c 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerHandler.h"
#include "ace/OS_NS_time.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 5a12435881d..951028cf9e4 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERHANDLER_H
#define MESSENGERHANDLER_H
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
index 18d792ccc13..becda190ed2 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <fstream>
#include <iostream>
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
index a4f9437effa..a47d0443e66 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "tao/TimeBaseC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
index 83f9c51a02d..e0c8900a624 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
index d130dc8a43e..68bbd34859f 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/RelativeRoundtripTimeout.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
index c1d7a99cf26..236882a41c3 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/DynamicThreadPool.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
idlflags += -Wb,pch_include=started_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
index 3f41a9b2e3b..6f0c98be0d0 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
index b148b7f2494..40e5462adaf 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "started_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
index c2c8b943b32..c7253a683cd 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "started_pch.h"
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/started_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
index 174cf26332f..4409d45b063 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/GracefulShutdown.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
index f598ee0d2b0..30bc8126513 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
index 5c5aef8f034..769f2b7c0b9 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
index b249ddc8228..bb4ae1a774c 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerServer.h"
#include "Messenger_i.h"
#include "MessengerShutdownTimer.h"
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
index abef2390901..cfa92c7a956 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
index 030229099be..f0ec520fa41 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
index 95fd2b9ada5..984f22d5d95 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Reactive.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
index b4269742a43..4c24da15ef1 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
index 693824c3b61..c5b1690a038 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
index eb38a354b26..6154792ff81 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/ThreadPerConnection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
index f58cb4e25aa..335d899f058 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
index b4269742a43..4c24da15ef1 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
index 1bc86c5f497..a3446d21fac 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
index 592f197b521..9065b56f5dd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/ThreadPool.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
index 654ada76322..5accf22f798 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
index 2311df25b71..816f42d67e0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
index 7169cbef5a9..33c23248a43 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index 0a383f256c1..e0c2bef7b55 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 95b6966049b..9d41e48ebdf 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
index 46ad1a97cca..1529aa4bef0 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
index a86a87c6494..6be8a2f6eb7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
index c0078d24f43..f13d90e8e70 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
index e015f52a7b1..29c576efe76 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
index dead4337e88..2a0088f5f8f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
index 0f18feb10e3..8324a171429 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index 0fab8bc1d3b..ee05418e97d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index cec3d86ddf5..b8d9b9b3a06 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
index 6ab15cdda99..fb5cb926455 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
index 28e5fe7e1ae..86baa499806 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
index 99713548b46..f2a0074c1e8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
index 10cfb5c70cd..3a60401f349 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
index c67158aed3a..32624452d6e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerC.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index 889a6659d3f..14b3c55232e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "ace/OS_NS_string.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
index 81758f935ce..d481b7803f5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 4bdf3fd51e1..44fd3a08df6 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerIORInterceptor.h"
#include <iostream>
char *
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
index 169e117664c..ff0110b1dd1 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
#include "tao/IORInterceptor/IORInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
index 85546623723..65fba6b3d7e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
#include "ServerIORInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
index 1554e33cbe9..5dfa84b5172 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
index 4ccc5ddf3ab..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index 2945d4b3816..b8ee6b53248 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
index 1bd687a032f..4870f1877c3 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
index 0e869a4ff00..c46cca7caf8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
index 15b0129df95..f3ec546e4b4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
index 4474bcc36f9..ceda3e3e52b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
index d5d6761f965..43a3b315995 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index 9aa625f79c1..ff6ef3abad8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
index 6c9f86ccd66..03cc0f9832b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
index 3408a7e5271..fc609c531c5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
index 4a2caec4654..0c2241c5312 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
index 3df2ac79841..b812a1851f3 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index 0fab8bc1d3b..ee05418e97d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index ce2a66ddb01..656d2383bce 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
index 4a68961eaa5..5bd7dd2a6d4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
index 99713548b46..f2a0074c1e8 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
index b855692098c..d05c74f3366 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
index 86ab2829b18..286f2f4a491 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerC.h"
#include "ServerInitializer.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index e95806dcf84..cb156afba0d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/OS_NS_string.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
index 5fba8b25c10..24befa12b87 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
index 6096a11c6e9..3874ab18825 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
index bb113f93d2c..c7485411606 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
index 4ccc5ddf3ab..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
index 654ada76322..5accf22f798 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger.idl b/TAO/DevGuideExamples/RTCORBA/Messenger.idl
index e7cc8a268d0..0ca944bcc16 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger.idl
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
index e1df21b61ef..7d22f0a9bca 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "common.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
index b9abf1d1d26..b5142206447 100644
--- a/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "common.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
index 2f66e7d7fd5..54a132d4978 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Thread.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc b/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
index 55ae18affc1..67dbfead978 100644
--- a/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
+++ b/TAO/DevGuideExamples/RTCORBA/RTCORBA.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/DevGuideExamples/RTCORBA/common.cpp b/TAO/DevGuideExamples/RTCORBA/common.cpp
index cece2ceefd9..4f5a17ce962 100644
--- a/TAO/DevGuideExamples/RTCORBA/common.cpp
+++ b/TAO/DevGuideExamples/RTCORBA/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
CORBA::ULong
diff --git a/TAO/DevGuideExamples/RTCORBA/common.h b/TAO/DevGuideExamples/RTCORBA/common.h
index 4fb308cb437..a53bc0a7918 100644
--- a/TAO/DevGuideExamples/RTCORBA/common.h
+++ b/TAO/DevGuideExamples/RTCORBA/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_COMMON_H
#define MESSENGER_COMMON_H
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger.idl b/TAO/DevGuideExamples/SmartProxies/Logger.idl
index 3b144588056..e3e7c507324 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger.idl
+++ b/TAO/DevGuideExamples/SmartProxies/Logger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Logger.idl
interface Logger
diff --git a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
index 8d7c9627b2d..d5a3a137655 100644
--- a/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/LoggerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// LoggerServer.cpp
#include "Logger_i.h"
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
index 88b4c38bf35..077bd43a8b2 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logger_i.h"
#include "ace/OS_NS_time.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/SmartProxies/Logger_i.h b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
index 4a4c9c4e612..d23787a08e9 100644
--- a/TAO/DevGuideExamples/SmartProxies/Logger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Logger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LOGGERI_H_
#define LOGGERI_H_
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger.idl b/TAO/DevGuideExamples/SmartProxies/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger.idl
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp b/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
index add68848b60..722500386c6 100644
--- a/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "Smart_Messenger_Proxy.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
index 580e8ae123f..8229952427c 100644
--- a/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc b/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
index 205a6bd1b4f..87c105c803a 100644
--- a/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
+++ b/TAO/DevGuideExamples/SmartProxies/SmartProxies.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
// The server doesn't use Smart Proxies, but since the client
// shares the idl generated source files, it needs to have the
// -Gsp option added to the tao_idl flags.
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
index a3572439088..35a37beb085 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Smart_Messenger_Proxy.cpp
#include "Smart_Messenger_Proxy.h"
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
index 6183c4bd0b0..7ecceedf1a0 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Smart_Messenger_Proxy.h
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
index 4faf7a61ecc..e7b3cbd31cc 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "_pch.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl b/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
index 9a122a1695b..272243e953a 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/bank.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Person {
public string name;
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
index ac5592f62d6..b8ea6f6f3ad 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/bank.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Dev_Bank_idl): taoidldefaults, valuetype {
idlflags += -Wb,pch_include=_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
index 22345636352..aaa387072a7 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "bankC.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
index ca6f1e731a7..e4be0be6e82 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "bankS.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
index 40cfdd6bfbb..b5d4854dfb1 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Message_i.h"
#include "MessengerC.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
index 704482c22d8..f762e101cf1 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Message_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSAGE_I_H
#define MESSAGE_I_H
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
index 299965806d6..e6a63fc9278 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
// Modified to make use of ValueTypes
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
index 7f4da7efa74..1c310744b18 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Message_i.h"
#include <iostream>
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
index 5cf051cb6c4..df2b58e8947 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
index 15a1dfed447..0ee9c784f67 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "_pch.h"
#include "Messenger_i.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
index a12e478f95e..dcfd641fbf5 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
index 423ba67a264..1827d58c00d 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/ValueTypes.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*DevGuideIDL): taoidldefaults, valuetype {
idlflags += -Wb,pch_include=_pch.h
IDL_Files {
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
index 4faf7a61ecc..e7b3cbd31cc 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.cpp
@@ -1,3 +1 @@
-// $Id$
-
#include "_pch.h"
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
index fe6d2628083..79d1d739c01 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/_pch.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PCH_H
#define PCH_H
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
index 419ff28718e..5867a6c0763 100644
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ b/TAO/TAO_IDL/ast/ast_argument.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index 848c3b06366..6f4ed33f32a 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index 795b63fc5f3..c72b4476ec7 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
index c6492c60164..e42960855fe 100644
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ b/TAO/TAO_IDL/ast/ast_check.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index f70d490f33b..c1cbe1729b5 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_component.h"
#include "ast_attribute.h"
#include "ast_provides.h"
diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
index 1600774bdfd..597f6434d52 100644
--- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_component_fwd.h"
#include "ast_visitor.h"
#include "utl_identifier.h"
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
index 5719f4ca019..fb198cd9d89 100644
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_connector.cpp b/TAO/TAO_IDL/ast/ast_connector.cpp
index f2d6dc7a27d..e92a55de7d7 100644
--- a/TAO/TAO_IDL/ast/ast_connector.cpp
+++ b/TAO/TAO_IDL/ast/ast_connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_connector.h"
#include "ast_visitor.h"
#include "utl_identifier.h"
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index 950743caa32..bc045389580 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_consumes.cpp b/TAO/TAO_IDL/ast/ast_consumes.cpp
index 61d164760f7..1a1308094aa 100644
--- a/TAO/TAO_IDL/ast/ast_consumes.cpp
+++ b/TAO/TAO_IDL/ast/ast_consumes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_consumes.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index e2e7fe673d8..394b6bfbdc2 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_emits.cpp b/TAO/TAO_IDL/ast/ast_emits.cpp
index 69450853908..581b557ec9b 100644
--- a/TAO/TAO_IDL/ast/ast_emits.cpp
+++ b/TAO/TAO_IDL/ast/ast_emits.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_emits.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 7bdf413076e..bd1e1c12443 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index c7abab6b8e7..0bfc81b2da9 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp
index 85ece04f369..107dc1fc1b8 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "ast_eventtype.h"
#include "ast_visitor.h"
#include "utl_identifier.h"
diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
index d44e3aeba3f..41690400f88 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_eventtype_fwd.h"
#include "ast_interface.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index f3598c77ed1..f2dddf6946b 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 9b6883266da..91ff8f5713f 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_extended_port.cpp b/TAO/TAO_IDL/ast/ast_extended_port.cpp
index 633f3aecc37..66a755dcb0e 100644
--- a/TAO/TAO_IDL/ast/ast_extended_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_extended_port.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_extended_port.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp
index 6502ee8c86a..15b779fbd10 100644
--- a/TAO/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO/TAO_IDL/ast/ast_factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index af4e4a5e07c..528297592c2 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_finder.cpp b/TAO/TAO_IDL/ast/ast_finder.cpp
index 972b21f5d4b..5945fdb228c 100644
--- a/TAO/TAO_IDL/ast/ast_finder.cpp
+++ b/TAO/TAO_IDL/ast/ast_finder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_finder.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 73600426c4b..94d2b85bf58 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index 75d83fa75a6..b7e773b1fdd 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_home.h"
#include "ast_component.h"
#include "ast_valuetype.h"
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 4aafc06dd89..9031cc249d5 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 5f0b8bb0c9e..5d01c81eebb 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_mirror_port.cpp b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
index fa5aa5f2922..640e556d5ea 100644
--- a/TAO/TAO_IDL/ast/ast_mirror_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_mirror_port.h"
#include "ast_porttype.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index bcd6c6c036c..7c6ecc1e7a0 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
index a2d555b72d2..db4cbca8c65 100644
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ b/TAO/TAO_IDL/ast/ast_native.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_native.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index a1196fcfa78..5ba409532b6 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_param_holder.cpp b/TAO/TAO_IDL/ast/ast_param_holder.cpp
index 380f4cad97a..a421873ba19 100644
--- a/TAO/TAO_IDL/ast/ast_param_holder.cpp
+++ b/TAO/TAO_IDL/ast/ast_param_holder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_param_holder.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_porttype.cpp b/TAO/TAO_IDL/ast/ast_porttype.cpp
index c197fef3185..28e9cf634c0 100644
--- a/TAO/TAO_IDL/ast/ast_porttype.cpp
+++ b/TAO/TAO_IDL/ast/ast_porttype.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_porttype.h"
#include "ast_provides.h"
#include "ast_uses.h"
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index 0fda4201ff7..db6d0923737 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_provides.cpp b/TAO/TAO_IDL/ast/ast_provides.cpp
index ffbc936c59e..07bfd679480 100644
--- a/TAO/TAO_IDL/ast/ast_provides.cpp
+++ b/TAO/TAO_IDL/ast/ast_provides.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_provides.h"
#include "ast_interface.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_publishes.cpp b/TAO/TAO_IDL/ast/ast_publishes.cpp
index 76817a7373d..07a31eb4d41 100644
--- a/TAO/TAO_IDL/ast/ast_publishes.cpp
+++ b/TAO/TAO_IDL/ast/ast_publishes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_publishes.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index daa002e4e74..d981d3cddb6 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 9a0d524a31d..220b85babc3 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 10ec64b0beb..13466274df4 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index f24af29fa5b..18366d6d89f 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index f62ed5c32a3..3659ee654f0 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index 7b1b8b62781..6f444e67dae 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// AST_StructureFwd nodes denote forward declarations of IDL structs.
// AST_StructureFwd nodes have a field containing the full declaration
// of the struct, which is initialized when that declaration is
diff --git a/TAO/TAO_IDL/ast/ast_template_module.cpp b/TAO/TAO_IDL/ast/ast_template_module.cpp
index 7a9404ed146..364040dc4ca 100644
--- a/TAO/TAO_IDL/ast/ast_template_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_template_module.h"
#include "ast_template_module_ref.h"
#include "ast_constant.h"
diff --git a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
index 7aad3c2c364..1156d1b020d 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_template_module_inst.h"
#include "ast_template_module.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
index 63b0d10f862..4110fe518d6 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_template_module_ref.h"
#include "ast_template_module.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 57b5eb5fb31..b24c485bb43 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 3940069da80..db07a34bbe8 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index fe4687fe00c..e7f26ff7936 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 67fdfe5d8b4..e2f72a2ada5 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
index 7cd63dcf00c..df21ba3993a 100644
--- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// AST_UnionFwd nodes denote forward declarations of IDL union.
// AST_UnionFwd nodes have a field containing the full declaration
// of the union, which is initialized when that declaration is
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
index 96ea4d01fc8..5dc0ee1ffb3 100644
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_label.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/ast/ast_uses.cpp b/TAO/TAO_IDL/ast/ast_uses.cpp
index 647271ec313..630a313f9ff 100644
--- a/TAO/TAO_IDL/ast/ast_uses.cpp
+++ b/TAO/TAO_IDL/ast/ast_uses.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_uses.h"
#include "ast_interface.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index 97d841e7c18..9502a41a4ae 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_valuebox.h"
#include "ast_visitor.h"
#include "utl_identifier.h"
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index e3fbd93f917..2f27d8ed3e6 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "ast_valuetype.h"
#include "ast_typedef.h"
#include "ast_factory.h"
diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
index 953861c4b7d..89b8a902a2c 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_valuetype_fwd.h"
#include "ast_interface.h"
#include "ast_visitor.h"
diff --git a/TAO/TAO_IDL/ast/ast_visitor.cpp b/TAO/TAO_IDL/ast/ast_visitor.cpp
index 9fa7462c7fa..70fdc7f9317 100644
--- a/TAO/TAO_IDL/ast/ast_visitor.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ast_visitor.h"
#include "ace/config-all.h"
diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp
index 00cb361db33..b1c4c1c68a9 100644
--- a/TAO/TAO_IDL/be/be_connector.cpp
+++ b/TAO/TAO_IDL/be/be_connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_connector.h"
#include "be_visitor.h"
#include "ast_module.h"
diff --git a/TAO/TAO_IDL/be/be_consumes.cpp b/TAO/TAO_IDL/be/be_consumes.cpp
index 792a0675e45..479ef491ae5 100644
--- a/TAO/TAO_IDL/be/be_consumes.cpp
+++ b/TAO/TAO_IDL/be/be_consumes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_consumes.h"
#include "be_eventtype.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_emits.cpp b/TAO/TAO_IDL/be/be_emits.cpp
index bad1fd05214..af1edb18102 100644
--- a/TAO/TAO_IDL/be/be_emits.cpp
+++ b/TAO/TAO_IDL/be/be_emits.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_emits.h"
#include "be_eventtype.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_extended_port.cpp b/TAO/TAO_IDL/be/be_extended_port.cpp
index 6198e5ee340..bf7be8e98b8 100644
--- a/TAO/TAO_IDL/be/be_extended_port.cpp
+++ b/TAO/TAO_IDL/be/be_extended_port.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_extended_port.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index aca95d1012e..e3ad62f4899 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -1,4 +1,3 @@
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/be/be_identifier_helper.cpp b/TAO/TAO_IDL/be/be_identifier_helper.cpp
index ba8e40586c2..9abb24ce0ba 100644
--- a/TAO/TAO_IDL/be/be_identifier_helper.cpp
+++ b/TAO/TAO_IDL/be/be_identifier_helper.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "be_identifier_helper.h"
#include "be_type.h"
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index c1bd5233162..0bc55c7d168 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global_extern.h"
#include "be_extern.h"
#include "../../tao/Version.h"
diff --git a/TAO/TAO_IDL/be/be_mirror_port.cpp b/TAO/TAO_IDL/be/be_mirror_port.cpp
index 7b330b35869..8ee81e31128 100644
--- a/TAO/TAO_IDL/be/be_mirror_port.cpp
+++ b/TAO/TAO_IDL/be/be_mirror_port.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_mirror_port.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_porttype.cpp b/TAO/TAO_IDL/be/be_porttype.cpp
index c0eef67e4fa..9cd5e14a99f 100644
--- a/TAO/TAO_IDL/be/be_porttype.cpp
+++ b/TAO/TAO_IDL/be/be_porttype.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_porttype.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 3f7b566179a..1db60dd8097 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp
index 0d4fd18ff2f..5d6fcbcf775 100644
--- a/TAO/TAO_IDL/be/be_provides.cpp
+++ b/TAO/TAO_IDL/be/be_provides.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_provides.h"
#include "be_interface.h"
#include "be_operation.h"
diff --git a/TAO/TAO_IDL/be/be_publishes.cpp b/TAO/TAO_IDL/be/be_publishes.cpp
index 7b748de9fa3..7920c556635 100644
--- a/TAO/TAO_IDL/be/be_publishes.cpp
+++ b/TAO/TAO_IDL/be/be_publishes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_publishes.h"
#include "be_eventtype.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_template_module.cpp b/TAO/TAO_IDL/be/be_template_module.cpp
index 86ada735c42..14fe8190139 100644
--- a/TAO/TAO_IDL/be/be_template_module.cpp
+++ b/TAO/TAO_IDL/be/be_template_module.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_template_module.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_template_module_inst.cpp b/TAO/TAO_IDL/be/be_template_module_inst.cpp
index 793f4898efd..3380ad2f6c7 100644
--- a/TAO/TAO_IDL/be/be_template_module_inst.cpp
+++ b/TAO/TAO_IDL/be/be_template_module_inst.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_template_module_inst.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_template_module_ref.cpp b/TAO/TAO_IDL/be/be_template_module_ref.cpp
index 807ce9135fc..20f30788315 100644
--- a/TAO/TAO_IDL/be/be_template_module_ref.cpp
+++ b/TAO/TAO_IDL/be/be_template_module_ref.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_template_module_ref.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_tmplinst.cpp b/TAO/TAO_IDL/be/be_tmplinst.cpp
index 9d0a424aad0..a5d051bd393 100644
--- a/TAO/TAO_IDL/be/be_tmplinst.cpp
+++ b/TAO/TAO_IDL/be/be_tmplinst.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_typecode/typecode_defn.h"
#include "ast_interface.h"
#include "ace/Singleton.h"
diff --git a/TAO/TAO_IDL/be/be_uses.cpp b/TAO/TAO_IDL/be/be_uses.cpp
index 64f599b6e36..1837fb30a19 100644
--- a/TAO/TAO_IDL/be/be_uses.cpp
+++ b/TAO/TAO_IDL/be/be_uses.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_uses.h"
#include "be_interface.h"
#include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
index ae6a842388b..544c8e1f539 100644
--- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_any_extracted_type_decl.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
index f5005170383..692367b1245 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_assign.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_attr_assign.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
index ff9507ee2d3..3667347c681 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_attr_init.h"
#include "be_visitor_context.h"
#include "be_helper.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
index 4ee3f4d0a7d..4ff0e93139e 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_attr_return.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
index 05e3c06f76f..6dc5900e433 100644
--- a/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attr_setarg_type.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_attr_setarg_type.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index 6859ab31091..d7114306b98 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interface.h"
be_visitor_interface_direct_proxy_impl_sh::
diff --git a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
index f1ea4cf1871..9917cbac4f4 100644
--- a/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_member_type_decl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_member_type_decl.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
index 6d32de4cf5a..6965580b91d 100644
--- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "be_visitor_null_return_value.h"
#include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index 41c1fe40707..714bcfa1e3b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "operation.h"
be_visitor_operation_direct_proxy_impl_ss::
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index 9e77753b934..46dadc29d59 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "operation.h"
be_visitor_operation_proxy_impl_xh::be_visitor_operation_proxy_impl_xh (
diff --git a/TAO/TAO_IDL/be_include/TAO_IDL_BE_Export.h b/TAO/TAO_IDL/be_include/TAO_IDL_BE_Export.h
index a7bafee327f..442ce2a6355 100644
--- a/TAO/TAO_IDL/be_include/TAO_IDL_BE_Export.h
+++ b/TAO/TAO_IDL/be_include/TAO_IDL_BE_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h
index bec713f376a..07c0370cf72 100644
--- a/TAO/TAO_IDL/be_include/be_connector.h
+++ b/TAO/TAO_IDL/be_include/be_connector.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_CONNECTOR_H
#define BE_CONNECTOR_H
diff --git a/TAO/TAO_IDL/be_include/be_consumes.h b/TAO/TAO_IDL/be_include/be_consumes.h
index 0aa8cfa1aea..40b7fbfe713 100644
--- a/TAO/TAO_IDL/be_include/be_consumes.h
+++ b/TAO/TAO_IDL/be_include/be_consumes.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_CONSUMES_H
#define BE_CONSUMES_H
diff --git a/TAO/TAO_IDL/be_include/be_emits.h b/TAO/TAO_IDL/be_include/be_emits.h
index d14d665455a..96970a433b9 100644
--- a/TAO/TAO_IDL/be_include/be_emits.h
+++ b/TAO/TAO_IDL/be_include/be_emits.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_EMITS_H
#define BE_EMITS_H
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 97e0fb8b5d0..23b831d80b1 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BE_EXCEPTION_H
#define BE_EXCEPTION_H
diff --git a/TAO/TAO_IDL/be_include/be_extern.h b/TAO/TAO_IDL/be_include/be_extern.h
index a2fb6f3da65..b6bb946bb8e 100644
--- a/TAO/TAO_IDL/be_include/be_extern.h
+++ b/TAO/TAO_IDL/be_include/be_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 4f199e83947..b6b1ed03ecb 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h
index e6df1c95500..cb47d6c2d07 100644
--- a/TAO/TAO_IDL/be_include/be_provides.h
+++ b/TAO/TAO_IDL/be_include/be_provides.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_PROVIDES_H
#define BE_PROVIDES_H
diff --git a/TAO/TAO_IDL/be_include/be_publishes.h b/TAO/TAO_IDL/be_include/be_publishes.h
index 64c7279bd88..ea3a41bff47 100644
--- a/TAO/TAO_IDL/be_include/be_publishes.h
+++ b/TAO/TAO_IDL/be_include/be_publishes.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_PUBLISHES_H
#define BE_PUBLISHES_H
diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h
index aed486e3437..d798651700c 100644
--- a/TAO/TAO_IDL/be_include/be_template_module_inst.h
+++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef BE_TEMPLATE_MODULE_INST_H
#define BE_TEMPLATE_MODULE_INST_H
diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h
index cd8a020461e..7046a7082fc 100644
--- a/TAO/TAO_IDL/be_include/be_template_module_ref.h
+++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef BE_TEMPLATE_MODULE_REF_H
#define BE_TEMPLATE_MODULE_REF_H
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
index 7ad8a751570..413a821b302 100644
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ b/TAO/TAO_IDL/be_include/be_union_label.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BE_UNION_LABEL_H
#define BE_UNION_LABEL_H
diff --git a/TAO/TAO_IDL/be_include/be_uses.h b/TAO/TAO_IDL/be_include/be_uses.h
index 497743b5b99..8384db531dd 100644
--- a/TAO/TAO_IDL/be_include/be_uses.h
+++ b/TAO/TAO_IDL/be_include/be_uses.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BE_USES_H
#define BE_USES_H
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 68768cc8c33..d0ff1c5aa58 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 5d1aab4f15a..14f3fa50900 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_component_header.cpp b/TAO/TAO_IDL/fe/fe_component_header.cpp
index 438dc06a6c9..0fc0f6e1355 100644
--- a/TAO/TAO_IDL/fe/fe_component_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_component_header.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fe_component_header.h"
#include "fe_extern.h"
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
index 7365f1930da..bb62caa0a08 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index c1070defaeb..605e4639f44 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_global.cpp b/TAO/TAO_IDL/fe/fe_global.cpp
index a65b88d2ec9..dc644b404a4 100644
--- a/TAO/TAO_IDL/fe/fe_global.cpp
+++ b/TAO/TAO_IDL/fe/fe_global.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "global_extern.h"
IDL_GlobalData *idl_global = 0;
diff --git a/TAO/TAO_IDL/fe/fe_home_header.cpp b/TAO/TAO_IDL/fe/fe_home_header.cpp
index 33fec49c214..2fd9f9a1f3c 100644
--- a/TAO/TAO_IDL/fe/fe_home_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_home_header.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fe_home_header.h"
#include "global_extern.h"
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index f77f6b81742..ce7b65beb8b 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 764fd9f4b3c..95c990a523a 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_obv_header.cpp b/TAO/TAO_IDL/fe/fe_obv_header.cpp
index 5c90e313661..f0c4644c87a 100644
--- a/TAO/TAO_IDL/fe/fe_obv_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_obv_header.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fe_obv_header.h"
#include "utl_err.h"
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
index d83e6b31ed7..64c0f8b0e9b 100644
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ b/TAO/TAO_IDL/fe/fe_private.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp
index c2fe558834e..7e4ac13855b 100644
--- a/TAO/TAO_IDL/fe/fe_utils.cpp
+++ b/TAO/TAO_IDL/fe/fe_utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fe_utils.h"
#include "fe_private.h"
#include "fe_extern.h"
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 9aae1199c4a..102bf09fb3d 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,4 +1,3 @@
-// $Id$
/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 6fa98a8933b..f642916fbce 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -1,4 +1,3 @@
-// $Id$
/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
diff --git a/TAO/TAO_IDL/include/TAO_IDL_FE_Export.h b/TAO/TAO_IDL/include/TAO_IDL_FE_Export.h
index 58b0d308ede..77771db7aa9 100644
--- a/TAO/TAO_IDL/include/TAO_IDL_FE_Export.h
+++ b/TAO/TAO_IDL/include/TAO_IDL_FE_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
index 48036780f79..f0320c6c53e 100644
--- a/TAO/TAO_IDL/include/ast.h
+++ b/TAO/TAO_IDL/include/ast.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index d50831a9395..17d9ef41401 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index f9d94826178..8f657fe0b96 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index c8ebf245889..81662dba6ae 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h
index 2d22f2562a1..2a8e15758f3 100644
--- a/TAO/TAO_IDL/include/ast_component.h
+++ b/TAO/TAO_IDL/include/ast_component.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_COMPONENT_AST_COMPONENT_HH
#define _AST_COMPONENT_AST_COMPONENT_HH
diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h
index 7031b09c92a..1c356431df0 100644
--- a/TAO/TAO_IDL/include/ast_component_fwd.h
+++ b/TAO/TAO_IDL/include/ast_component_fwd.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_COMPONENT_FWD_AST_COMPONENT_FWD_HH
#define _AST_COMPONENT_FWD_AST_COMPONENT_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index 79a8ff55fab..18018eba25d 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h
index 895f0b00376..60dd5360f99 100644
--- a/TAO/TAO_IDL/include/ast_connector.h
+++ b/TAO/TAO_IDL/include/ast_connector.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_CONNECTOR_H
#define AST_CONNECTOR_H
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index 9a291f565f3..4af90810fc7 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h
index 6dd17285520..24407232a0e 100644
--- a/TAO/TAO_IDL/include/ast_consumes.h
+++ b/TAO/TAO_IDL/include/ast_consumes.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_CONSUMES_H
#define AST_CONSUMES_H
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 4580643e84c..5517834723c 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h
index b8e0a450e95..20c8b276b9c 100644
--- a/TAO/TAO_IDL/include/ast_emits.h
+++ b/TAO/TAO_IDL/include/ast_emits.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_EMITS_H
#define AST_EMITS_H
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index 61e6fd49fb8..fb373291f97 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 862ff167f26..a7d5df282d3 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h
index c002947fd6d..f47c01def16 100644
--- a/TAO/TAO_IDL/include/ast_eventtype.h
+++ b/TAO/TAO_IDL/include/ast_eventtype.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_VALUETYPE_AST_EVENTTYPE_HH
#define _AST_VALUETYPE_AST_EVENTTYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
index 1d7f9fe27d8..a928e482232 100644
--- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_VALUETYPE_FWD_AST_EVENTTYPE_FWD_HH
#define _AST_VALUETYPE_FWD_AST_EVENTTYPE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index a1a50b4a64f..996b6c63114 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index fd6daa5fba9..61bdc7b3684 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_extended_port.h b/TAO/TAO_IDL/include/ast_extended_port.h
index 2874e565b0f..3b49cefc994 100644
--- a/TAO/TAO_IDL/include/ast_extended_port.h
+++ b/TAO/TAO_IDL/include/ast_extended_port.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_EXTENDED_PORT_H
#define AST_EXTENDED_PORT_H
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
index b58e8ed493f..c2c9e0f00af 100644
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ b/TAO/TAO_IDL/include/ast_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h
index 1f9fc6bcfbd..ad2996b0a23 100644
--- a/TAO/TAO_IDL/include/ast_factory.h
+++ b/TAO/TAO_IDL/include/ast_factory.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 9cbfcecf02c..3436d810fbe 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h
index 8e6b55f3688..ce0403c6936 100644
--- a/TAO/TAO_IDL/include/ast_finder.h
+++ b/TAO/TAO_IDL/include/ast_finder.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef TAO_IDL_AST_FINDER_H
#define TAO_IDL_AST_FINDER_H
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 8f3b86a19aa..931f46e782a 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h
index 6a94d995f51..d12a3624009 100644
--- a/TAO/TAO_IDL/include/ast_home.h
+++ b/TAO/TAO_IDL/include/ast_home.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_HOME_AST_HOME_HH
#define _AST_HOME_AST_HOME_HH
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index c688884cfbe..1be13e4fda3 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 887bcd68777..9d2968181f6 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h
index 9f2a280c6af..a5fbc761b4f 100644
--- a/TAO/TAO_IDL/include/ast_mirror_port.h
+++ b/TAO/TAO_IDL/include/ast_mirror_port.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_MIRROR_PORT_H
#define AST_MIRROR_PORT_H
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index cf2dba748ca..eefe207a66d 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index cf3ff280d92..04a5fec2681 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_NATIVE_H_
#define _AST_NATIVE_H_
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index fd3efc4b572..cb4684c94e5 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h
index 0f8fcb8a6a9..e3c99455c5c 100644
--- a/TAO/TAO_IDL/include/ast_param_holder.h
+++ b/TAO/TAO_IDL/include/ast_param_holder.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef AST_PARAM_HOLDER_H
#define AST_PARAM_HOLDER_H
diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h
index 7b810151039..1a745e2ad87 100644
--- a/TAO/TAO_IDL/include/ast_porttype.h
+++ b/TAO/TAO_IDL/include/ast_porttype.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef AST_PORTTYPE_H
#define AST_PORTTYPE_H
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index d5a4860fd4f..311e89c3e04 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_provides.h b/TAO/TAO_IDL/include/ast_provides.h
index 8d4b5546092..6074f47e09d 100644
--- a/TAO/TAO_IDL/include/ast_provides.h
+++ b/TAO/TAO_IDL/include/ast_provides.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_PROVIDES_H
#define AST_PROVIDES_H
diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h
index 483c59ad755..1ef752f8f9c 100644
--- a/TAO/TAO_IDL/include/ast_publishes.h
+++ b/TAO/TAO_IDL/include/ast_publishes.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_PUBLISHES_H
#define AST_PUBLISHES_H
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index 06560ecbac6..542de927785 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index dee65422b5e..69787e142d2 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index 76b73c2e00b..5fbd6631885 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index e61c09fb52e..b33e5e138ee 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h
index 25bfbbdcaa5..8481a85fea2 100644
--- a/TAO/TAO_IDL/include/ast_structure_fwd.h
+++ b/TAO/TAO_IDL/include/ast_structure_fwd.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_STRUCTURE_FWD_AST_STRUCTURE_FWD_HH
#define _AST_STRUCTURE_FWD_AST_STRUCTURE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h
index d271accf7c8..bfc44bc6f74 100644
--- a/TAO/TAO_IDL/include/ast_template_module.h
+++ b/TAO/TAO_IDL/include/ast_template_module.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef AST_TEMPLATE_MODULE_H
#define AST_TEMPLATE_MODULE_H
diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h
index 431efa333dd..4b2031cbcaa 100644
--- a/TAO/TAO_IDL/include/ast_template_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_template_module_inst.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef AST_TEMPLATE_MODULE_INST_H
#define AST_TEMPLATE_MODULE_INST_H
diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h
index 7543d7df08d..5abdba89e19 100644
--- a/TAO/TAO_IDL/include/ast_template_module_ref.h
+++ b/TAO/TAO_IDL/include/ast_template_module_ref.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef AST_TEMPLATE_MODULE_REF_H
#define AST_TEMPLATE_MODULE_REF_H
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index e4071cf9e49..e3698c729c9 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index e5ce4633bd4..54b8a0e309b 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index fb2927c4760..7397bbde637 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 3310ffb4238..a7e04a1a6d8 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h
index 361af5dbdb1..13d391677cd 100644
--- a/TAO/TAO_IDL/include/ast_union_fwd.h
+++ b/TAO/TAO_IDL/include/ast_union_fwd.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_UNION_FWD_AST_UNION_FWD_HH
#define _AST_UNION_FWD_AST_UNION_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index 33df6970673..87f66e08704 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h
index 5de26d74997..10115d09a77 100644
--- a/TAO/TAO_IDL/include/ast_uses.h
+++ b/TAO/TAO_IDL/include/ast_uses.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef AST_USES_H
#define AST_USES_H
diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h
index 77213527a0b..cd8e3366031 100644
--- a/TAO/TAO_IDL/include/ast_valuebox.h
+++ b/TAO/TAO_IDL/include/ast_valuebox.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_VALUEBOX_AST_VALUEBOX_HH
#define _AST_VALUEBOX_AST_VALUEBOX_HH
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index e65b495dc23..f8398efce68 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_INTERFACE_AST_VALUETYPE_HH
#define _AST_INTERFACE_AST_VALUETYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
index e77ebafae5f..b31b56f1b7d 100644
--- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#ifndef _AST_INTERFACE_FWD_AST_VALUETYPE_FWD_HH
#define _AST_INTERFACE_FWD_AST_VALUETYPE_FWD_HH
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
index 57697e78af7..757d14db7e1 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h
index e17bcf4503f..4e14c6426d4 100644
--- a/TAO/TAO_IDL/include/fe_component_header.h
+++ b/TAO/TAO_IDL/include/fe_component_header.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FE_COMPONENT_HEADER_H
#define FE_COMPONENT_HEADER_H
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
index e34495f5d9e..4527d2693e8 100644
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ b/TAO/TAO_IDL/include/fe_declarator.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 8ad73cfdb16..2dd29077402 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h
index 7f276821639..7583a75a398 100644
--- a/TAO/TAO_IDL/include/fe_home_header.h
+++ b/TAO/TAO_IDL/include/fe_home_header.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FE_HOME_HEADER_H
#define FE_HOME_HEADER_H
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index 2e332ddd936..243e5dda333 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h
index ed3b71c4886..0a25d4310c1 100644
--- a/TAO/TAO_IDL/include/fe_obv_header.h
+++ b/TAO/TAO_IDL/include/fe_obv_header.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FE_OBV_HEADER_H
#define FE_OBV_HEADER_H
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
index 405d3963619..6a27602750a 100644
--- a/TAO/TAO_IDL/include/fe_private.h
+++ b/TAO/TAO_IDL/include/fe_private.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h
index 5333c4754e8..6cf66a62418 100644
--- a/TAO/TAO_IDL/include/fe_utils.h
+++ b/TAO/TAO_IDL/include/fe_utils.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FE_UTILS_H
#define FE_UTILS_H
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
index e9eef69e8d6..847c0316531 100644
--- a/TAO/TAO_IDL/include/global_extern.h
+++ b/TAO/TAO_IDL/include/global_extern.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
index 673e52c0ecb..a4bede43aef 100644
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ b/TAO/TAO_IDL/include/idl_defines.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 866b6d4dfa6..3e8cff756ff 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
index b48f8f77139..c787d641b1c 100644
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ b/TAO/TAO_IDL/include/idl_narrow.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h
index 0e9195b8d57..65c271f00ec 100644
--- a/TAO/TAO_IDL/include/nr_extern.h
+++ b/TAO/TAO_IDL/include/nr_extern.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
index 7f0ead854c7..5f0528977bf 100644
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_decllist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 04b40186f7f..a5ddb9d0482 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
index 53e935571f4..a04f6276994 100644
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_exceptlist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
index 4220a0e9008..3a7f8ebc875 100644
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ b/TAO/TAO_IDL/include/utl_exprlist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
index 57742738473..3afb4ef6301 100644
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ b/TAO/TAO_IDL/include/utl_identifier.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
index e66ddc6efd1..9f4927d0178 100644
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_idlist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
index 029f66cc004..8fe36f5b7db 100644
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ b/TAO/TAO_IDL/include/utl_indenter.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
index 24e5c76e9ed..161b294503f 100644
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ b/TAO/TAO_IDL/include/utl_labellist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
index d3d136f7ea5..7e7ed5d781f 100644
--- a/TAO/TAO_IDL/include/utl_list.h
+++ b/TAO/TAO_IDL/include/utl_list.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
index e36ac200319..46b946faa5b 100644
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ b/TAO/TAO_IDL/include/utl_namelist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 4d2bdbfb9b3..a21d5a0e40d 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_scope_T.cpp b/TAO/TAO_IDL/include/utl_scope_T.cpp
index 5bfa87e3319..905ed44ff58 100644
--- a/TAO/TAO_IDL/include/utl_scope_T.cpp
+++ b/TAO/TAO_IDL/include/utl_scope_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_IDL_UTL_SCOPE_T_CPP
#define TAO_IDL_UTL_SCOPE_T_CPP
diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h
index 9cb63b6d043..006e99b7d6d 100644
--- a/TAO/TAO_IDL/include/utl_scoped_name.h
+++ b/TAO/TAO_IDL/include/utl_scoped_name.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
index e7084338265..56906593efd 100644
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ b/TAO/TAO_IDL/include/utl_stack.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
index 87d30dbf7d5..9489421c04f 100644
--- a/TAO/TAO_IDL/include/utl_string.h
+++ b/TAO/TAO_IDL/include/utl_string.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
index 1229cbe1a00..f355ba746b8 100644
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_strlist.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index b0ee22b687a..e38ee6cbe69 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index 2125f730f01..d228c009f5e 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index d9822c6d3da..b3c6bbedc1a 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-cr
-// $Id$
-
project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe {
exename = tao_idl
libs += TAO_IDL_BE
diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc
index 68a45884728..c8b82e8130f 100644
--- a/TAO/TAO_IDL/tao_idl_be.mpc
+++ b/TAO/TAO_IDL/tao_idl_be.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe {
sharedname = TAO_IDL_BE
dynamicflags += TAO_IDL_BE_BUILD_DLL
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index f9c656243ad..5545b789330 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_IDL_GEN) {
requires += tao_idl_fe_gen
verbatim(gnuace, local) {
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
index 005391fd392..4e370719019 100644
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_decllist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 477e256faf3..32eac6c23b1 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
index 1f79b79409d..f7fbdaba704 100644
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exceptlist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_exprlist.cpp
index e3542615200..5e8bb062aa1 100644
--- a/TAO/TAO_IDL/util/utl_exprlist.cpp
+++ b/TAO/TAO_IDL/util/utl_exprlist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index a43f55a6496..3cebe32f2dc 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index f8a410b05b4..2b37b3b33a1 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
index 17007053795..601dec5b420 100644
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_idlist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp
index cecb25a0e2e..cfe6a9374ea 100644
--- a/TAO/TAO_IDL/util/utl_indenter.cpp
+++ b/TAO/TAO_IDL/util/utl_indenter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp
index a73ab2c4455..f00665cdf06 100644
--- a/TAO/TAO_IDL/util/utl_labellist.cpp
+++ b/TAO/TAO_IDL/util/utl_labellist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
index c1feef9c99d..6e5a60e188f 100644
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_list.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
index e5ff59333fb..b41b655bbc8 100644
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_namelist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index b2120a33cf4..a829f439c14 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index 70c0168fe62..2505eb4f5c5 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index d523d6ec1b9..3e44e85e94a 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index c7fc4c52574..1db9b62ab5c 100644
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_strlist.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
index 8230799791a..a906684c453 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Quoter.idl
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
index 9d9eb79afc7..52343b55905 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults, anytypecode {
IDL_Files {
Quoter.idl
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
index 7a56a77bac8..b4b5302abef 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client) : orbsvcsexe, portableserver, naming {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index d68df58bb9b..a5a345f3a8f 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Quoter.idl
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index 9734edddfc7..5319478805d 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stock_Factory_Locator_i.h"
#include "Stock_Factory_i.h"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
index ec5d0dcd73f..c796748e1f8 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stock_Factory_i.h"
Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
index 1e1cf9130f5..da0108f727c 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ACE header files
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
index 3aa440348be..8a3dbc053f8 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ACE header files
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
index bda7ce45f5c..8f582cda866 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ACE+TAO headers
#include "ace/Reactor.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
index 9b840d93e78..2d7fd13d37d 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Broker_i.h
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Common_Export.h b/TAO/docs/tutorials/Quoter/RTCORBA/Common_Export.h
index ec6ed7d95cd..8f801d64193 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Common_Export.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Common_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl RTCORBA_Quoter_Common
// ------------------------------
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
index cf82cf24385..a6c5d8b6b96 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ACE header files
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdlib.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index f2ee0a466cc..d5e0b70a470 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// local headers
#include "Distributor_i.h"
#include "Stock_PriorityMapping.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
index 42cf2eda881..9d8e072b74e 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Distributor_i.h
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index 641e33c54ec..167b035f472 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// local headers
#include "StockNameConsumer_i.h"
#include "Broker_i.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
index 02045e1bd37..9636f90e23b 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file StockNameConsumer_i.h
*
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc b/TAO/docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
index 8cb9c97b3f2..6329504013a 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockQuoter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
// -*- MPC -*-
// $Id: StockQuoter.mpc
// $author: Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
index 705b8a02b1e..1a22404b831 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Stock_Database.h
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
index 06d3db94665..4eac82cfc32 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// local headers
#include "Stock_PriorityMapping.h"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
index 931ba509498..b114b2124d3 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file Stock_PriorityMapping.h
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index 9fce32b5ba3..e230d2f6d9a 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Quoter.idl
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index 2d652b96d8d..ebdbf22b52f 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stock_i.h"
#include <orbsvcs/Event_Utilities.h>
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
index 9f229fe2c70..b372108a908 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoexe, portableserver {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
index 1009987b26b..b1279f14b11 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client) : taoexe, portableserver, rtevent, naming {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index de16f7ebf0a..7ead0a498ab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
index 45efc9bd128..48dc069cd1b 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client) : taoexe, portableserver {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
index 51f7f3745e3..97ad11675b4 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoserver {
libs += Quoter_Idl_Lib
after += Quoter_Idl_Lib
diff --git a/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc b/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc
index cc97a77a069..b3fa0232d9c 100644
--- a/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc
+++ b/TAO/docs/tutorials/Quoter/idl/Quoter_idl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Lib) : taoexe, portableserver {
dynamicflags += QUOTER_COMMON_BUILD_DLL
idlflags += -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT
diff --git a/TAO/docs/tutorials/Quoter/idl/quoter_common_export.h b/TAO/docs/tutorials/Quoter/idl/quoter_common_export.h
index fa39fda25f1..fa8329434cd 100644
--- a/TAO/docs/tutorials/Quoter/idl/quoter_common_export.h
+++ b/TAO/docs/tutorials/Quoter/idl/quoter_common_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index f4c2a9f81d9..19a8ab7a5f3 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Sched_Params.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.inl b/TAO/examples/AMH/Sink_Server/Base_Server.inl
index 70dd0a098d1..87240a2232c 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.inl
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.inl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Base_Server.h"
ACE_INLINE CORBA::ORB_ptr
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index c729d440b5d..a04b0456469 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 5e7d22fe322..79c7fa8f9a5 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index 53419811254..151db89c651 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_AMH_Server.h"
#include "AMH_Servant.h"
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index bc3477c888b..e9eb93c6da2 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMH_Servant.h"
#include "Base_Server.h"
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 26dfc3111de..b11d7e7baaa 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoexe, messaging, ami {
IDL_Files {
test.idl
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 5b7120d0b94..e6138231d81 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index de12b1e1fab..6fc01d78829 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Progress_i.h"
#include <FL/Fl_Slider.H>
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 39a19803ca3..878d1c9d740 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index a2ebfb494da..0408df00347 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Progress_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
index 468c4508383..8dda2c7ce93 100644
--- a/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
+++ b/TAO/examples/Advanced/ch_12/Advanced_ch_12.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
index c61eb267c20..4d86c0fc893 100644
--- a/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
+++ b/TAO/examples/Advanced/ch_18/Advanced_ch_18.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
index 740dcb48c2f..966002197db 100644
--- a/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
+++ b/TAO/examples/Advanced/ch_21/Advanced_ch_21.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index d20f18f86d7..0c845713b02 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
time.idl
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index bace6362305..14caa68f7b9 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -37,7 +37,6 @@ get_gmt (void)
return tod;
}
-// $Id$
// Changelog for Henning and Vinoski's chapter 18 example
// ______________________________________________________
diff --git a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
index 468c4508383..8dda2c7ce93 100644
--- a/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
+++ b/TAO/examples/Advanced/ch_8_and_10/Advanced_ch_8_and_10.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoclient {
IDL_Files {
CCS.idl
diff --git a/TAO/examples/Borland/Broadcaster.idl b/TAO/examples/Borland/Broadcaster.idl
index 5eae517f59b..cb80c7fae57 100644
--- a/TAO/examples/Borland/Broadcaster.idl
+++ b/TAO/examples/Borland/Broadcaster.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Receiver.idl"
interface Broadcaster
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index cc51ac124a2..996a0865fb6 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ChatClient.mpc b/TAO/examples/Borland/ChatClient.mpc
index cb44c0bd968..532ff30269d 100644
--- a/TAO/examples/Borland/ChatClient.mpc
+++ b/TAO/examples/Borland/ChatClient.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : taoserver, utils, iortable, vcl {
exename = chatclient
IDL_Files {
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index ca04e226874..777ceac534c 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ChatClientWnd.h b/TAO/examples/Borland/ChatClientWnd.h
index 230fe893287..6d81abdcb4e 100644
--- a/TAO/examples/Borland/ChatClientWnd.h
+++ b/TAO/examples/Borland/ChatClientWnd.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ChatClientWndH
#define ChatClientWndH
diff --git a/TAO/examples/Borland/ORBThread.cpp b/TAO/examples/Borland/ORBThread.cpp
index dfa11b3d185..4a0ae7da59e 100644
--- a/TAO/examples/Borland/ORBThread.cpp
+++ b/TAO/examples/Borland/ORBThread.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
// To be able to handle CORBA requests an application usually calls orb->run().
// To integrate this into VCL applications we will run the orb in a separate
diff --git a/TAO/examples/Borland/ORBThread.h b/TAO/examples/Borland/ORBThread.h
index 8c4e50d6b50..b8174e44a48 100644
--- a/TAO/examples/Borland/ORBThread.h
+++ b/TAO/examples/Borland/ORBThread.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ORBThreadH
#define ORBThreadH
diff --git a/TAO/examples/Borland/Receiver.idl b/TAO/examples/Borland/Receiver.idl
index 90ea6570071..9ccca7244d1 100644
--- a/TAO/examples/Borland/Receiver.idl
+++ b/TAO/examples/Borland/Receiver.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Receiver
{
// = TITLE
diff --git a/TAO/examples/Borland/ReceiverImpl.cpp b/TAO/examples/Borland/ReceiverImpl.cpp
index de9d9dd2746..0814ed2eda3 100644
--- a/TAO/examples/Borland/ReceiverImpl.cpp
+++ b/TAO/examples/Borland/ReceiverImpl.cpp
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#include "pch.h"
#pragma hdrstop
diff --git a/TAO/examples/Borland/ReceiverImpl.h b/TAO/examples/Borland/ReceiverImpl.h
index f48fa48bdd8..b4ce57cd8f8 100644
--- a/TAO/examples/Borland/ReceiverImpl.h
+++ b/TAO/examples/Borland/ReceiverImpl.h
@@ -1,4 +1,3 @@
-// $Id$
//---------------------------------------------------------------------------
#ifndef ReceiverImplH
#define ReceiverImplH
diff --git a/TAO/examples/Borland/pch.h b/TAO/examples/Borland/pch.h
index b890766880e..84ff767cab4 100644
--- a/TAO/examples/Borland/pch.h
+++ b/TAO/examples/Borland/pch.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef INCLUDE_PCH_H
#define INCLUDE_PCH_H
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 4681a366900..c4086557990 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
test.idl
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 6657488c8c4..dc71e7223d6 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 5907b23948a..a01d94181e4 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index 15d4771a09c..9d173dccde3 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 365d3550e6c..87d910c12b9 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index f3333908a56..9910ee0e5f0 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
index f3b5e903ecf..d0309b39b15 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index 72bc6832494..e932771d85d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
index 059d878bcab..137791f75c5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index ab94d4f520a..ddcf4f4e82f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index b7b33f0638e..9751030b8ae 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index fd20301060f..15b2f17f4c2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
index ef49e94a384..f9d1517383f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
index b3f427fb678..db9540357b3 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
index fe1ed1fbc77..fc093084f1e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index 4b368339776..035329c2b13 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index ad87e0cc2e1..b688a1991d9 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooServantList.h"
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 94a4c970852..84c39803f86 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOSERVANTLIST_H
#define FOOSERVANTLIST_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 8b86406037e..eca9c5e79db 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index cd448d7c64c..4e191c54b2a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 68a5a9caf78..15826a53af5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "FooServantList.h"
#include "FooC.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
index 8e6e6abdfd4..0f5b1e1a040 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
index 0c217199a38..f32f6ce770b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
index 7ef554f5499..c0bf7adb85d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index a1956a49971..e71f14f0860 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index 095e2ce0e90..24f3ef64fa2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index 426b75936a0..5018a78c872 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index eb1ca654c5a..ea7db122e12 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 6cb5f2399b0..aee9cea9cfe 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "OrbTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
index dc422b926b2..76e7619aca6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
index 5599a70d674..b197ebd4588 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
index 70e98b7adae..356a29a0f8e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
index 905491e3204..9ad558fa6cb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_threadpool, messaging, taoserver, pi, avoids_corba_e_micro {
exename = server_main
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index 81301279214..ce50c43b3e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index 18f8b0f6631..5a013fe4f88 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
index 845d9ccfab7..f1e633185ba 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 8271798514e..50984c0332d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index bda78300650..651e3c1d151 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index 7c186a6394b..c8742f70cfd 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
index 1a77e8463f7..fba7ea86b08 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
index 961ebd01d21..4131a591654 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "tao/Exception.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
index aad69c6586d..98bb3e96ce0 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Callback.idl
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index 81301279214..ce50c43b3e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index d45d948fb53..ce967dfe29b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index fa9783bd18b..f9772d5c7a6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Callback_i.h"
#include "ClientTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
index 2d852a56d1b..689c7371573 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
index 36b85adcad6..c2fcd1377e6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 1035c897cab..00a50947930 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooServantList.h"
#include "Foo_i.h"
#include "Callback_i.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index 13ec1db2ede..4a06102f735 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOSERVANTLIST_H
#define FOOSERVANTLIST_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index 74f53da07f8..7a5925b63b9 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index ab3ad761965..df548468b7a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index eaec63e6e49..9773a40f86a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "OrbTask.h"
#include "FooServantList.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
index 967f4dab144..6f390f129cc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
index 5af35beb0fc..d6c955a974c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index 824dca4d76d..44807f56780 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GT
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index c003a88e7ef..ccfcbb7837d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "FooC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
index 3126bd31074..eb50cb27a4f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
index f4a756a31b1..58ecb9b7646 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index 84807a8b9f0..a5a2f905d7e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "OrbShutdownTask.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index a5bf36c4040..858fc65a6da 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 85508b0d44f..eb21e8b2c91 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_i.h"
#include "FooS_T.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
index ef49e94a384..f9d1517383f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
index a4c0931488c..7dd626716ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "ace/Log_Msg.h"
#include "ace/SString.h"
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
index 5af35beb0fc..d6c955a974c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "ace/Log_Msg.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index d5014089066..25e016ec2fe 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Consumer.idl
diff --git a/TAO/examples/Callback_Quoter/Consumer.idl b/TAO/examples/Callback_Quoter/Consumer.idl
index 4e6020992e6..b6af1c59514 100644
--- a/TAO/examples/Callback_Quoter/Consumer.idl
+++ b/TAO/examples/Callback_Quoter/Consumer.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_CONSUMER_IDL)
#define _CONSUMER_IDL
diff --git a/TAO/examples/Callback_Quoter/Notifier.idl b/TAO/examples/Callback_Quoter/Notifier.idl
index 1c86ed60537..bfce4c6eb7c 100644
--- a/TAO/examples/Callback_Quoter/Notifier.idl
+++ b/TAO/examples/Callback_Quoter/Notifier.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_NOTIFIER_IDL)
#define _NOTTIFIER_IDL
diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp
index a9115e68ca5..d270936307c 100644
--- a/TAO/examples/Callback_Quoter/consumer.cpp
+++ b/TAO/examples/Callback_Quoter/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
// This function runs the Callback Quoter Consumer application.
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 71f37e18d99..dde220c305c 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Input_Handler.h"
// This is the main driver program for the Callback Quoter Notifier.
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index 7b914093937..e4149bc9027 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_i.h"
// This function runs the Callback Quoter Supplier daemon.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 02b9580e694..dda94ad2795 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
Web_Server.idl
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index d9d6b766b42..ef4f4883e4a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index ce3f466f560..528ecbb6071 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Content_Iterator_i.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index e9280f93f83..33476782525 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl b/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
index f669e39d98c..ffc7c9f13a3 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
+++ b/TAO/examples/Content_Server/AMI_Iterator/Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Web_Server
// = TITLE
// IDL schema definition for Web server interface.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 87a83637077..b28938ec142 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index 3f8ad1f65a4..1f1949e5bd5 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index 9ebc2e75c6c..5fce6a6c45e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, ami {
IDL_Files {
Push_Web_Server.idl
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index be9f9f1f6e4..cc3d6900c3b 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 9dcf50f26c6..1741f68d52e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 5fddbc0a6a5..f6ccae5cba0 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Push_Iterator_Factory_i.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 85674d453df..ad1b852321c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Log_Msg.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
index 96e0b8be4e4..267a677c4e8 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Web_Server
// = TITLE
// IDL schema definition for Web server interface.
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 08cf6ab48e1..0d9e236c511 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 260b304f23e..42306470870 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 6c65b16a9fa..83f06289214 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index e7acb5611c0..301f86f033d 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "Content_Iterator_i.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 4675543c102..4913265e7e1 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Web_Server.idl
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl b/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
index 4b1c6eeb54e..240c44a6384 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
+++ b/TAO/examples/Content_Server/SMI_Iterator/Web_Server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// IDL schema definition for Web server interface.
module Web_Server
{
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index d89d9cd7370..41e1d89b3ce 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "ace/FILE_Connector.h"
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index da1af33a3e1..b85b1283d0d 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// Ossama Othman <ossama@uci.edu>
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 3041d1afbb5..f32b1c1ba03 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 914bfed034d..4a6a49ee4a2 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Input_Handler.h"
#include "Consumer_Handler.h"
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index ef11c776d47..ad8c80495e5 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Event_Comm.idl
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index a657a17d73c..85b523498c8 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Comm_i.h"
#include "ace/OS_NS_regex.h"
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 9f900949038..8fcf3d4b7e8 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index dac24dbb822..05b7eb175aa 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Server.h"
#include "Event_CommC.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index 94b1b1eda12..cef8fb40b2c 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Comm_i.h"
#include "Notifier_Handler.h"
#include "Supplier_Input_Handler.h"
diff --git a/TAO/examples/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index 7d088d2b0ed..73088a48391 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Handler.h"
#include "Consumer_Input_Handler.h"
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index f0ad39d3226..7596f378a0f 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Server.h"
#include "notifier.h"
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index 97431ab7973..a6dd1cb8cac 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notifier_Handler.h"
#include "Supplier_Input_Handler.h"
#include "supplier.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
index 819b2417b66..951c31ede5b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file EDF_Scheduling.idl
*
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
index 050093a6815..bc340972ac1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Kokyu_DSRT_Schedulers) : orbsvcslib, kokyu, rtscheduling, rtcorba, codecfactory {
sharedname = Kokyu_DSRT_Schedulers
dynamicflags += KOKYU_DSRT_SCHEDULERS_BUILD_DLL
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
index 4d9236a75f2..63e4c8d5473 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_dsrt_schedulers_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Kokyu_DSRT_Schedulers
// ------------------------------
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 84714ec2543..7434ad5c740 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
index 5a74bab0021..bffc3e5cde2 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 5900943be33..5c508a5d761 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index c4f8f2c095a..82730645a95 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 0a1f7838295..0b4ad021f97 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
index 9b222313347..e4e297d659d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index 95d01d23791..202ee9489a3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 5ef2c2820a5..ebe9a514d1b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 73284159fa9..ada335dc7f1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
index ed79bd08918..103c4017317 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index cfab2f8bd16..f28ae234f5d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 5ef2c2820a5..ebe9a514d1b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/High_Res_Timer.h"
#include "ace/Task.h"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
index 60a08452bc1..8d54b24d6f0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
RTScheduling::Current_ptr current,
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 711ed4e8235..641f79354ff 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Identity.idl
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index ff8308fc06d..e6a4069813d 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Identity_Server.h"
#include "Identity_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 292a5096df1..24294b84f8a 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Load_Balancer_i.h"
#include "ace/Auto_Ptr.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 1eed96e354b..7e688db602c 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Identity.idl
diff --git a/TAO/examples/Logging/Logger.idl b/TAO/examples/Logging/Logger.idl
index a87d9a799dc..b1cdfd31a95 100644
--- a/TAO/examples/Logging/Logger.idl
+++ b/TAO/examples/Logging/Logger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_LOGGER_IDL
#define TAO_LOGGER_IDL
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index e0f2f98a515..765a792642e 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LoggerC.h"
#include "Logger_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index b6ab1cd9e13..f6bf7b4e9ce 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Logger.idl
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 8bfc668cb41..9c72c3ba08e 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Service_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 0c8c78361a3..01068f6bfab 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Service_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp
index 1a887e5a1db..83fe0565eb7 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/examples/Logging/Logging_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Logging_Test_i.h"
// This function runs the Logging service test.
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index c628af31064..865adcf7d55 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LoggerC.h"
#include "Logging_Test_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 4955e621d89..83d39bc3037 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This version of Simple_Util doesn't need to link against orbsvcs
// On the other hand it has no naming service.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types.idl b/TAO/examples/OBV/Typed_Events/Event_Types.idl
index 40c167d1250..c12607b0d2f 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types.idl
+++ b/TAO/examples/OBV/Typed_Events/Event_Types.idl
@@ -5,8 +5,6 @@
// Torsten Kuepper
//
-// $Id$
-
// Event inheritance hierarchy ===========================
// Base class --------------------------------------------
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 89beb8bc74f..7ce46031ad8 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Types_impl.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index b39e70b0a22..93657769e99 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (EVENT_TYPES_IMPL_H)
#define EVENT_TYPES_IMPL_H
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 515974a0005..2cdd221fc7b 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "Event_Types_impl.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index 02469a4f9d6..52818a238a5 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index fc7aad0ca62..6c6db881151 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Server_i.h"
diff --git a/TAO/examples/Persistent_Grid/Grid.idl b/TAO/examples/Persistent_Grid/Grid.idl
index 20f885c4978..bf3eaf0dc49 100644
--- a/TAO/examples/Persistent_Grid/Grid.idl
+++ b/TAO/examples/Persistent_Grid/Grid.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Grid
{
// = TITLE
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index f9974bf5511..89f5082b7dc 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Grid_i.h"
// Default constructor.
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 29c7283f87a..b6df6788444 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Grid.idl
diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp
index 479b8a8cf98..a8d3ab80ead 100644
--- a/TAO/examples/Persistent_Grid/client.cpp
+++ b/TAO/examples/Persistent_Grid/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Grid_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp
index 4e6c7791336..9c9d2311dd2 100644
--- a/TAO/examples/Persistent_Grid/persistent_client.cpp
+++ b/TAO/examples/Persistent_Grid/persistent_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Persistent_Client.h"
// The "persistent client" program for the application.
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 5b830ac001c..5511f3154e9 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple_util.h"
#include "Grid_i.h"
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
index ebbfe56df81..11458556880 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sd -Sp
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
index 23386cbee7c..504bc47132e 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface UDP
{
// = TITLE
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index 1cb47fa5c34..f453fbbb379 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/High_Res_Timer.h"
#include "ace/SString.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index d09b526d3fb..b598f94f81e 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_i.h"
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
index ed5ce859b74..f13f3f5f303 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sp -Sd
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index 74daec629d4..2986f5ce526 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
int Simple_Server_count=0;
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 3ed51650eb1..c6b33c60748 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Quoter.idl
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 82237568e89..c001988e8c0 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Read_Buffer.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index 0d7054ff5b0..e85ed290b83 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcslib, namingexe, rt_server {
exename = activity
// We use macros instead of dynamicflags so that
diff --git a/TAO/examples/RTCORBA/Activity/activity_export.h b/TAO/examples/RTCORBA/Activity/activity_export.h
index a33eec53a40..e1f4c003eb8 100644
--- a/TAO/examples/RTCORBA/Activity/activity_export.h
+++ b/TAO/examples/RTCORBA/Activity/activity_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index 3c34d07b456..77cb464198f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Starter): portableserver, namingexe {
after += MIF_Scheduler_Starter
libs += RTSchedSynch
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
index fb76d92387c..ccc0fb5e06b 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/fp_dt_creator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl FP_DT_Creator
// ------------------------------
diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc
index 8e46c315901..d868a7dabd5 100644
--- a/TAO/examples/RTScheduling/Job.mpc
+++ b/TAO/examples/RTScheduling/Job.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Job): portableserver {
idlflags += -St \
-Wb,export_macro=JOB_Export \
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index 2bc6940bf48..a77487e663e 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Starter): portableserver, namingexe {
after += RTSchedSynch
libs += RTSchedSynch
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h b/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
index 58ef8f81839..bbca86d5e3a 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/mif_dt_creator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl MIF_DT_Creator
// ------------------------------
diff --git a/TAO/examples/RTScheduling/RTSchedTestLib.mpc b/TAO/examples/RTScheduling/RTSchedTestLib.mpc
index 1db65b1257d..43e0a70c442 100644
--- a/TAO/examples/RTScheduling/RTSchedTestLib.mpc
+++ b/TAO/examples/RTScheduling/RTSchedTestLib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedTestLib): naming, rtscheduling, negotiate_codesets, rtportableserver, rtcorba {
after += Job
libs += Job RTSchedSynch
diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc
index 77a2ae1d681..3f7a7e08081 100644
--- a/TAO/examples/RTScheduling/Synch.mpc
+++ b/TAO/examples/RTScheduling/Synch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedSynch): portableserver {
idlflags += -St \
-Wb,export_macro=SYNCH_Export \
diff --git a/TAO/examples/RTScheduling/job_export.h b/TAO/examples/RTScheduling/job_export.h
index ce66aa0fdbb..1d2ef2b6da0 100644
--- a/TAO/examples/RTScheduling/job_export.h
+++ b/TAO/examples/RTScheduling/job_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/RTScheduling/rtschedtestlib_export.h b/TAO/examples/RTScheduling/rtschedtestlib_export.h
index f0af7a1a282..42b430af689 100644
--- a/TAO/examples/RTScheduling/rtschedtestlib_export.h
+++ b/TAO/examples/RTScheduling/rtschedtestlib_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/RTScheduling/synch_export.h b/TAO/examples/RTScheduling/synch_export.h
index eed7a51efcc..96a49576df4 100644
--- a/TAO/examples/RTScheduling/synch_export.h
+++ b/TAO/examples/RTScheduling/synch_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl SYNCH
// ------------------------------
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4ecda885ac7..131ecc962d1 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_UTIL_C
#define SIMPLE_UTIL_C
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 0e06d61a688..7ce8ccbb7b0 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AccountManager_i.h"
#include "Account_i.h"
#include "tao/debug.h"
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index ab95ce86fc1..799af2aac41 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Account_i.h"
// Constructor
diff --git a/TAO/examples/Simple/bank/Bank.idl b/TAO/examples/Simple/bank/Bank.idl
index 7061fcaf462..b08174d10e1 100644
--- a/TAO/examples/Simple/bank/Bank.idl
+++ b/TAO/examples/Simple/bank/Bank.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module Bank
{
// = TITLE
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 34179d05bdd..8538b3889ca 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
Bank.idl
diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp
index 297d3e5527f..668808968a9 100644
--- a/TAO/examples/Simple/bank/client.cpp
+++ b/TAO/examples/Simple/bank/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Bank_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 63cd167bf87..17585f3e419 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "AccountManager_i.h"
diff --git a/TAO/examples/Simple/chat/Broadcaster.idl b/TAO/examples/Simple/chat/Broadcaster.idl
index 2704650fb74..44d175c9755 100644
--- a/TAO/examples/Simple/chat/Broadcaster.idl
+++ b/TAO/examples/Simple/chat/Broadcaster.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Receiver.idl"
interface Broadcaster
diff --git a/TAO/examples/Simple/chat/Receiver.idl b/TAO/examples/Simple/chat/Receiver.idl
index 90ea6570071..9ccca7244d1 100644
--- a/TAO/examples/Simple/chat/Receiver.idl
+++ b/TAO/examples/Simple/chat/Receiver.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Receiver
{
// = TITLE
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index 074729eee76..e341d8d7773 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/examples/Simple/echo/Echo.idl b/TAO/examples/Simple/echo/Echo.idl
index 993d08612bd..ffc69e77ab6 100644
--- a/TAO/examples/Simple/echo/Echo.idl
+++ b/TAO/examples/Simple/echo/Echo.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_ECHO_IDL)
#define _ECHO_IDL
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index f3e45069e40..c96b220634c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_i.h"
// Constructor.
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 8cf5cd00295..942f1e502e2 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Echo.idl
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index 4c9ab20ae95..a49faf9c04e 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Echo_i.h"
diff --git a/TAO/examples/Simple/grid/Grid.idl b/TAO/examples/Simple/grid/Grid.idl
index 1a1c14bc1b4..f356da4a95a 100644
--- a/TAO/examples/Simple/grid/Grid.idl
+++ b/TAO/examples/Simple/grid/Grid.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Grid
{
// = TITLE
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index a06e6bea30a..df8733c3027 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Grid_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 80e59a5b0a7..3e32772a96d 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Grid_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index b1560d75e3d..b616d1981f8 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Grid.idl
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index ed349bf0ecd..7069e3acc74 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Grid_i.h"
diff --git a/TAO/examples/Simple/time-date/Alt_Resource_Factory.h b/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
index 34bcb27cebf..463e0e5cec3 100644
--- a/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
+++ b/TAO/examples/Simple/time-date/Alt_Resource_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Definition for Win32 Export directives.
// This file is generated automatically by
// ${ACE_ROOT}/GenExportH.BAT
diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc
index 7eaefad4fc4..692e8c64d8f 100644
--- a/TAO/examples/Simple/time-date/Simple_time_date.mpc
+++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*lib): portableserver, taolib_with_idl {
sharedname = Time_Date
// The svc conf files assume that the dll is in the current directory
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index b98abc6a2d0..935af26ce7c 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ACE_BUILD_SVC_DLL
# define ACE_BUILD_SVC_DLL
#endif
diff --git a/TAO/examples/Simple/time-date/Time_Date.idl b/TAO/examples/Simple/time-date/Time_Date.idl
index f32d58e2b6b..2fea0aafb1d 100644
--- a/TAO/examples/Simple/time-date/Time_Date.idl
+++ b/TAO/examples/Simple/time-date/Time_Date.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
interface Time_Date
{
// = TITLE
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 8a0fe5c13e6..05d0a085854 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Time_Date_i.h"
#include "ace/OS_NS_time.h"
#include "ace/Reactor.h"
diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp
index b29c342665f..38575d118d1 100644
--- a/TAO/examples/Simple/time-date/client.cpp
+++ b/TAO/examples/Simple/time-date/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Time_Date_Client_i.h"
// The client program for the application.
diff --git a/TAO/examples/Simple/time/Time.idl b/TAO/examples/Simple/time/Time.idl
index 3d07b80659f..f58b2eaec33 100644
--- a/TAO/examples/Simple/time/Time.idl
+++ b/TAO/examples/Simple/time/Time.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Time
{
// = TITLE
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 1d4fc6c70e0..e65b6add559 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Time_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 37d0a64e62c..2a7be01b8ba 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../Simple_util.h"
#include "Time_i.h"
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index e48f95033bc..51ceed80494 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Time.idl
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index dd3b916adb2..3558942289e 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
gendir = .
diff --git a/TAO/examples/Simulator/NavWeap.idl b/TAO/examples/Simulator/NavWeap.idl
index e2478529262..8044fa72dc2 100644
--- a/TAO/examples/Simulator/NavWeap.idl
+++ b/TAO/examples/Simulator/NavWeap.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// =========================================================================================================
//
// = FILE
diff --git a/TAO/examples/Simulator/Persian.idl b/TAO/examples/Simulator/Persian.idl
index cca3dfb14d8..fc10d9aa80b 100644
--- a/TAO/examples/Simulator/Persian.idl
+++ b/TAO/examples/Simulator/Persian.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// ===========================================================================
//
// = FILE
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 6cdef42a6a3..3b01e89fbec 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (TypeCode_Creation_Test) : taoclient, typecodefactory {
exename = create_tc
Source_Files {
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index 93e39c2ac0c..ba0c21c4a93 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
diff --git a/TAO/examples/ior_corbaloc/corbaloc.idl b/TAO/examples/ior_corbaloc/corbaloc.idl
index 968fb66e80e..71a220ea3ae 100644
--- a/TAO/examples/ior_corbaloc/corbaloc.idl
+++ b/TAO/examples/ior_corbaloc/corbaloc.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module corbaloc
{
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index f2c5451d7cd..46b05e70f35 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
corbaloc.idl
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index b6c2cefea6d..c1eb257d44d 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
// server.cpp
#include "status_i.h"
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index ebc94e73019..d9e7c972a22 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "status_i.h"
corbaloc_Status_i::corbaloc_Status_i ()
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 7873d238dc3..59438b1b708 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef STATUS_I_H
#define STATUS_I_H
diff --git a/TAO/examples/mfc/MainFrm.cpp b/TAO/examples/mfc/MainFrm.cpp
index 2e4f4e1db01..650259e3b71 100644
--- a/TAO/examples/mfc/MainFrm.cpp
+++ b/TAO/examples/mfc/MainFrm.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MainFrm.cpp : implementation of the CMainFrame class
//
diff --git a/TAO/examples/mfc/MainFrm.h b/TAO/examples/mfc/MainFrm.h
index 3ec56663f6e..2e29e9f9c81 100644
--- a/TAO/examples/mfc/MainFrm.h
+++ b/TAO/examples/mfc/MainFrm.h
@@ -1,5 +1,3 @@
-// $Id$
-
// MainFrm.h : interface of the CMainFrame class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/Resource.h b/TAO/examples/mfc/Resource.h
index d0cff0d6290..b9967602d74 100644
--- a/TAO/examples/mfc/Resource.h
+++ b/TAO/examples/mfc/Resource.h
@@ -1,5 +1,3 @@
-// $Id$
-
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by SERVER.RC
diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp
index 154d3b78886..bd1211b1c68 100644
--- a/TAO/examples/mfc/StdAfx.cpp
+++ b/TAO/examples/mfc/StdAfx.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// stdafx.cpp : source file that includes just the standard includes
// server.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/TAO/examples/mfc/StdAfx.h b/TAO/examples/mfc/StdAfx.h
index 5b6159d207a..b1ad956399b 100644
--- a/TAO/examples/mfc/StdAfx.h
+++ b/TAO/examples/mfc/StdAfx.h
@@ -1,5 +1,3 @@
-// $Id$
-
// stdafx.h : include file for standard system include files,
// or project specific include files that are used
// frequently, but are changed infrequently
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 84859ecb403..55daf764cee 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "w32_testS.h"
#include "ace/streams.h"
diff --git a/TAO/examples/mfc/client.mpc b/TAO/examples/mfc/client.mpc
index ac08fdbb715..8ddd815e284 100644
--- a/TAO/examples/mfc/client.mpc
+++ b/TAO/examples/mfc/client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(MFC_Client): namingexe, portableserver {
idlflags += -Wb,pch_include=StdAfx.h
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 8edf273928d..235478c21ba 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp : Defines the class behaviors for the application.
#include "stdafx.h"
diff --git a/TAO/examples/mfc/server.h b/TAO/examples/mfc/server.h
index 93685fdd03f..cc281431d3f 100644
--- a/TAO/examples/mfc/server.h
+++ b/TAO/examples/mfc/server.h
@@ -1,5 +1,3 @@
-// $Id$
-
// server.h : main header file for the SERVER application
//
diff --git a/TAO/examples/mfc/server.mpc b/TAO/examples/mfc/server.mpc
index 0c1bad91693..d109a479e88 100644
--- a/TAO/examples/mfc/server.mpc
+++ b/TAO/examples/mfc/server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(MFC_Server): namingexe, portableserver, ace_mfc {
after += MFC_Client
exename = server
diff --git a/TAO/examples/mfc/serverDoc.cpp b/TAO/examples/mfc/serverDoc.cpp
index 99fe9e6b357..8941e455c90 100644
--- a/TAO/examples/mfc/serverDoc.cpp
+++ b/TAO/examples/mfc/serverDoc.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// serverDoc.cpp : implementation of the CServerDoc class
#include "stdafx.h"
diff --git a/TAO/examples/mfc/serverDoc.h b/TAO/examples/mfc/serverDoc.h
index 1c5e90fd4b4..7abfa6f910a 100644
--- a/TAO/examples/mfc/serverDoc.h
+++ b/TAO/examples/mfc/serverDoc.h
@@ -1,5 +1,3 @@
-// $Id$
-
// serverDoc.h : interface of the CServerDoc class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/serverView.cpp b/TAO/examples/mfc/serverView.cpp
index de68f815540..d5c50850b4c 100644
--- a/TAO/examples/mfc/serverView.cpp
+++ b/TAO/examples/mfc/serverView.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// serverView.cpp : implementation of the CServerView class
#include "stdafx.h"
diff --git a/TAO/examples/mfc/serverView.h b/TAO/examples/mfc/serverView.h
index 87a80348ea8..25c5a1714be 100644
--- a/TAO/examples/mfc/serverView.h
+++ b/TAO/examples/mfc/serverView.h
@@ -1,5 +1,3 @@
-// $Id$
-
// serverView.h : interface of the CServerView class
//
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/examples/mfc/w32_test.idl b/TAO/examples/mfc/w32_test.idl
index 4f6423e2ad5..56e33c88e7d 100644
--- a/TAO/examples/mfc/w32_test.idl
+++ b/TAO/examples/mfc/w32_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface W32_Test_Interface
{
// = TITLE
diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp
index 0deb96a2837..eecacc3dbc4 100644
--- a/TAO/examples/mfc/w32_test_impl.cpp
+++ b/TAO/examples/mfc/w32_test_impl.cpp
@@ -1,7 +1,5 @@
#include "StdAfx.h"
-// $Id$
-
#include "w32_test_impl.h"
W32_Test_Impl::~W32_Test_Impl (void)
diff --git a/TAO/examples/mfc/w32_test_impl.h b/TAO/examples/mfc/w32_test_impl.h
index 846029aa05a..1022be5cf40 100644
--- a/TAO/examples/mfc/w32_test_impl.h
+++ b/TAO/examples/mfc/w32_test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef w32_test_impl_h
#define w32_test_impl_h
diff --git a/TAO/interop-tests/AnyTypeCode/idl/Demo.idl b/TAO/interop-tests/AnyTypeCode/idl/Demo.idl
index 65c1a36ae53..e1f6fc1b19e 100644
--- a/TAO/interop-tests/AnyTypeCode/idl/Demo.idl
+++ b/TAO/interop-tests/AnyTypeCode/idl/Demo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Demo
{
diff --git a/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.cpp b/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.cpp
index 712f6a09ad2..c68408811fb 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/BaseValueFactory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "BaseValueFactory.h"
#include "BaseValueImpl.h"
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
index aa2f113e49b..c6ff430c4fb 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp
@@ -1,4 +1,3 @@
-// $Id$
// FUZZ: disable check_for_ace_log_categories
#include "DemoC.h"
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo.mpc b/TAO/interop-tests/AnyTypeCode/tao/Demo.mpc
index 8675b36cca8..977459875a1 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo.mpc
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults, valuetype {
idlflags -= -Sa -St
IDL_Files {
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
index 46887fb989b..1832c0e368d 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// FUZZ: disable check_for_ace_log_categories
/**
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
index 33f34709220..c04236e94ea 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
+++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/**
* Code generated by the The ACE ORB (TAO) IDL Compiler v2.1.4
* TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/interop-tests/AnyTypeCode/tao/Server.cpp b/TAO/interop-tests/AnyTypeCode/tao/Server.cpp
index 71fd606f0e2..8483ade637c 100644
--- a/TAO/interop-tests/AnyTypeCode/tao/Server.cpp
+++ b/TAO/interop-tests/AnyTypeCode/tao/Server.cpp
@@ -1,4 +1,3 @@
-// $Id$
// FUZZ: disable check_for_ace_log_categories
#include "Demo_i.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/CdrOutArg.mpc b/TAO/interop-tests/CdrOutArg/tao/CdrOutArg.mpc
index fe508ffe2bf..8dd2fc493b8 100644
--- a/TAO/interop-tests/CdrOutArg/tao/CdrOutArg.mpc
+++ b/TAO/interop-tests/CdrOutArg/tao/CdrOutArg.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
../idl/test.idl
diff --git a/TAO/interop-tests/CdrOutArg/tao/client.cpp b/TAO/interop-tests/CdrOutArg/tao/client.cpp
index 106eb7505fa..9ba9a67b3cc 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
index d119e7ce4c3..45ffa3d97a6 100644
--- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/server.cpp b/TAO/interop-tests/CdrOutArg/tao/server.cpp
index 7b9a6ad3c05..cea32828b0f 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
index e21b78a994c..1761e2b4f04 100644
--- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
index 8d4e9c83763..3b6ca427da1 100644
--- a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
+++ b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
CDR_Out_Arg_i::CDR_Out_Arg_i (CORBA::ORB_ptr orb)
diff --git a/TAO/interop-tests/wchar/interop_wchar.idl b/TAO/interop-tests/wchar/interop_wchar.idl
index 8b8a7ca3b56..61964b73590 100644
--- a/TAO/interop-tests/wchar/interop_wchar.idl
+++ b/TAO/interop-tests/wchar/interop_wchar.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Tests for interoperability between TAO and JacORB for sending wchar data
// The CDR defines separate serialization functions for reading and writing
// wchar, wchar[] and wstring data. Encapsulated wchar data is also tested.
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index e256622242d..23e723733e2 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
interop_wchar.idl
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 61c0dbcbc1a..25186770861 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
exename = tao_cosconcurrency
InstallData_Files {
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 95c22c1a3c9..4b735e5dddc 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Daemon_Utilities.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index c1d70b797be..e52e9a807f2 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
exename = tao_cosevent
InstallData_Files {
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
index 208d82687fe..01fa8a4523c 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
index e586269cfd7..d4035549bcb 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
index 8a17a07ca08..f74c6545761 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
index 1d66e52a524..2ac224abd80 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushSupplier of Echo events.
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
index ce1e164120f..c625d77490d 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_skel {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
index 67a61e1786e..febe5435be6 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
index e586269cfd7..d4035549bcb 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
index 8a17a07ca08..f74c6545761 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
index e616a556368..ad2da8bb0b1 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushSupplier of Echo events.
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
index cbdbc4a21cd..1caedc76b33 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
index d469b7c5512..7365aa874dc 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ConsumerMain.cpp
// Main program for a TypedPushConsumer of Messenger objects.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
index 4d6ea9515a0..fb9d8f77ed3 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "Consumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
index 6af0ab7bc63..eb8d282ec62 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Consumer_i.h
// Implements a TypedPushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
index bac20c4abe1..6f6cdf2f33c 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
index 3cda5041e65..66486acfb86 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_skel {
exename = Supplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
index 8162a6bf508..12bbe67878b 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a TypedPushSupplier of Messenger objects.
#include "orbsvcs/CosTypedEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
index 92ad339261a..a401ffdd498 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushConsumer of Echo events.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
index dd571baada7..44d8d7f1944 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
index d1a621f3c70..a67c5f1c819 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
index 16fef65a5e0..6a00490e6cf 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
index 6d693ad7f46..33d2946cabe 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
index 74545e5f7fd..718344d8d9e 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
index d3a202ba988..e3131db4457 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
index f166a3d1257..bc04b0e8996 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
index 70271836d2e..45ddebdb3a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
index d1a621f3c70..a67c5f1c819 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 1f8e78e255b..e06fb21e21f 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index ad28a202bd2..18dd4175aff 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index 9f3dd500486..373818b574d 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*_Dev_Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
index 44433fb5a00..3bbccdf1b26 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.cpp
#include "SimpleAddressServer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
index 9c346d87a81..d5ba0c603a1 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.h
#ifndef SIMPLEADDRESSSERVER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
index 133bfec7d4f..b4354fd7d1a 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
index f02608af6f5..2c75f1cb614 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger {
boolean send_message (in string user_name, in string subject, inout string message);
};
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
index 8d54b9f04cb..e6d23ec302e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
index dd032f72d3a..c3b588acd63 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
index 0e1e7d1793b..c224376be09 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <exception>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
index d129ac6800a..af61f133d87 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
index b1dd624d3b4..61b13116ae6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
index f02608af6f5..2c75f1cb614 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger {
boolean send_message (in string user_name, in string subject, inout string message);
};
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
index 7659b23a2cd..548cfa93d47 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/SString.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
index f97b43da4da..b86312d4220 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
index 401d9a7cd1c..fce3618c8ce 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
index 10f376d0ed0..50d880249f6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
index 6526e159b7e..62ab0ba3355 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
index b761ffd2b29..b171436a7b4 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
index 4a6a52b9b75..6a7363d408e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MessengerServer.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
index 944aef0f190..d2bda4bf1bc 100644
--- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//
// IFRBrowser.cpp
//
diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
index 8ac11a758fb..81dfc6c5dbe 100644
--- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
+++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module warehouse
{
interface inventory
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
index 815d5d11285..53654da5596 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(NamingService*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
index d5c8320b9a3..085eacdf119 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
index 72c893f917c..065531c70e3 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
index 449d57cd576..e5e55c56cfa 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
index 2931c9af9c6..12c13e00231 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
index eb1baab211b..b3c61b6b158 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
index 11a86fe736f..9436c6ad8e6 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
index e43f2776d0b..9a758e812a6 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerTask.h"
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
index bc5cdebca15..2c3242589d4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERTASK_H
#define MESSENGERTASK_H
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
index dda5b2b6a36..d4b43f49e53 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "MessengerTask.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
index 6f2c99971e9..8f84e2918a8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
index 647b32f0a8f..4b5cbba13e7 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
index 6a91c764766..225dcbfea04 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Messenger): namingexe, naming_serv {
requires += threads
}
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
index 01bea71a6f0..71268a4c3ad 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
index a9c67a032b0..4176d24f881 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
index 9c8104ebaa5..fe30be3471b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
index 736549ca88f..7707a444aa1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
index ed0b14b832b..7a35c676210 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
index 90be87592af..6d05f65ede8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventSequenceConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
index e8bdfef2775..bccc18fa496 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
index 4bd0dee0204..c47f465d145 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventSequenceSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
index 3a5a153a42e..0916ff71c5e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
index c7e25db57d8..54ab8dac3e0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
{
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
index e2ef6e68a4b..8d00caeea38 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
index 251383637b2..f5761a14769 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
index ad055da144b..54a3ec2ab39 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index 9d3dadaa1a5..ddc2a0b93ee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
index 949f5c87dc6..d05f869ca23 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
index 67245745272..6420601b781 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
index 657fea8c323..be6ae506933 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
index 8d52a5af557..ee8f68f6e63 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
index 89fdc1f0544..ce7ed668126 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
index 458d1746892..8938018d98d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
index f63bc493769..10a9e283676 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
index 087c07b3aba..4327f7e112f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
index bcf2f8ceeaf..28e2fb05627 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
index 2cee3e77fd8..a7c4c008e31 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
index 4d086d17e7e..a8331596d84 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
index 9f18951c030..64846510eea 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
index 789bd3b575f..f9642e73f00 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
index 6bbee91521d..b596d076974 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
index 1fd41b6459e..8728eb776c4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
index a2831e16f0f..bdbdc2eb77a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
index 38fa49c29e9..2d9c4182adb 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
index adb5bd999c8..caa915228d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index 18fd224aa8e..b11df7abb34 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
index 6df2455fcb0..6921775d62e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
index cf6f2cec87c..0208d26fc7f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
index 1c886f4552c..e5024d5c00a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
index 7e335ee5ed3..ad834dd609c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
index 22b66bac034..d9fb63f56d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
index 401201354b4..9ccdbcc3740 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
index 684122ac49f..a1c11e2cc82 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
index 86c10e74910..0f4a599cd41 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
index e6cf9911d12..0c3cf2b94d5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
index aac055fad6c..4390df96b8d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
index 9593e561210..57435039d6a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
index 55c7936e0e6..a7ef3d0a956 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
index 7ab9090a365..8f3e9b62eec 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
index a1b646d43c6..f053d4af659 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
index 38fa49c29e9..2d9c4182adb 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
index 567e8e1a57c..69d59d6dbf0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
index 18fd224aa8e..b11df7abb34 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
index 01fad5fb2d0..e6999f98ee5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
index 789bd3b575f..f9642e73f00 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
index 0b7adaf87a7..ca7a74bb15a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
index 1fd41b6459e..8728eb776c4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
index 92fdf82fd13..d269451a068 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
index 9eb0591df2e..83115d8465c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
index 8fd79a67cb8..fb667d54f9c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _PRIORITIES_H_
#define _PRIORITIES_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
index 2915af028d6..b662bc653b8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
index adb5bd999c8..caa915228d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
index 0747d830bbf..263b4d03d66 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
index 6df2455fcb0..6921775d62e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
index a3bd8c12943..2ad676a6cc5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
index 5d3cb836453..56bb0b9cae4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
index b1465b88b3f..04368337c92 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
index 58b72ff1f41..14e332e2672 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
index 8abe0871b55..27eba7e188a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 5b5f93e2167..2def116b05a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
index 15471aaedde..28e15e9d4f9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
index 7f4d6bc3524..b3d363c0d52 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
index 6dd45e0b20c..c4447b4aaaa 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
index 0bd7c8a5ccb..8cf0e0abd35 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
index 37d97731643..175802a164b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
index c6782f26005..0ecc4d6e97d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
index 08c2c95625a..26400a9741a 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include "MessengerC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
index 1bd687a032f..4870f1877c3 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 0133711c16a..6bdd7c6a1de 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
index 15b0129df95..f3ec546e4b4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
index 4474bcc36f9..ceda3e3e52b 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
index af4307307eb..7376b2e1281 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
index 3ee2f4c0965..f920ab4198a 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
index 3b5134a0f34..a1123ce09e9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
index 95cb35a442e..c4ac773fcc4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
index 18367d88c3e..7b4bef43561 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
index 128524db35d..02aff8b734a 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LongSeq.pidl"
valuetype MyEvent
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
index c2cb67e1f49..c47878eb0fc 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EVENT_H_
#define EVENT_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
index ac56f4b75f4..329f3d5f8bb 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*supplier) : taoexe, portableserver, valuetype, notify, portableserver, event_skel {
exename = supplier
source_files {
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index 87918070ec3..ac2684ce17d 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This supplier requires that the Notify_Service is started with
// -IOROutput notify.ior -channel -nonamesvc
// at minimum.
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
index f4996d63f1e..a443e406eb6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This supplier requires that the Notify_Service is started with
// -IOROutput notify.ior -channel -nonamesvc
// at minimum.
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index ae380b50111..796b2156377 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Sched_Params.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
index ba972852924..62a75e255f5 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver {
exename = tao_dump_schedule
}
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index fd392a917fd..29726be0784 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Service.h"
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc
index 25e20564bef..c4a4d2db2f6 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.mpc
+++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop, svc_utils {
exename = tao_rtevent
}
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
index 4b6c9608d08..5272cfc9150 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRT_Event_Service): orbsvcsexe, utils, rtschedevent, ftrteventchannel, ftorbutils, install {
exename = ftrt_eventservice
includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 348061a30c7..389059de415 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_EventService.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 22766f6b718..2c4ee830c36 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "EventChannelFactory_i.h"
#include "ace/Process.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index fd86aeed1c4..3d1fb378775 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "EventChannelFactory_i.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index 22990c1de45..6f3cc7119e0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies, install, svc_utils {
after += FaultTolerance
exename = ftrtec_factory_service
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index af5a753136a..60e94824d93 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/SString.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
index 776ae50a998..72804950e55 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient, strategies, install {
exename = ftrtec_gateway_service
includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
index befc6b319ac..1fc693a4ea8 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "FT_Naming_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
index bb8f2820b48..9ebeba5d3dc 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_Naming_Service.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h"
#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
index a0d546fa73a..6fd6bb03905 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, imr_client, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = tao_ft_naming
Header_Files {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 75d1a7a6218..aa4dcccaf3c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_Property_Validator.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "orbsvcs/FT_ReplicationManagerC.h"
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index 4fc203b9cdd..8e72e8939ff 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils {
sharedname = TAO_ReplicationManagerLib
dynamicflags += TAO_REPLICATIONMANAGERLIB_BUILD_DLL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
index b6a46c4cf8e..4cef9dc97cd 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_ReplicationManagerLib
// ------------------------------
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
index a530e7f7890..99f9623a49c 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : taoserver, orbsvcsexe, install, fault_tolerance, svc_utils {
exename = tao_fault_detector
Source_Files {
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index 41619023419..068c136fc84 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : taoserver, orbsvcsexe, install, fault_tolerance, notification_serv {
exename = tao_fault_notifier
Source_Files {
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index c8ab2234b8f..c7a6dba46c3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "IFR_Service.h"
#include "tao/Environment.h"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index f0555f0b4f9..d51d3ad101b 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "IFR_Service.h"
#include "orbsvcs/IFRService/ComponentRepository_i.h"
#include "orbsvcs/IFRService/Options.h"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index d04d4fe4613..ffa5967da2f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// The ifrservice base project inherits from minimum_corba, so it's no longer
// necessary to add minimum_corba to 'avoids' here.
project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, svc_utils {
diff --git a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
index 3ae082aa61e..86c88699253 100644
--- a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
+++ b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h
index 4961b84387e..220a1ae7c44 100644
--- a/TAO/orbsvcs/IFR_Service/be_extern.h
+++ b/TAO/orbsvcs/IFR_Service/be_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 72d33de3371..94916420226 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "global_extern.h"
#include "be_extern.h"
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 52e313254e0..79b85bd6728 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_args.cpp b/TAO/orbsvcs/IFR_Service/drv_args.cpp
index d7f5a0951ff..ffca5814d63 100644
--- a/TAO/orbsvcs/IFR_Service/drv_args.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_args.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
index 0e653bc1ed1..3012c700d76 100644
--- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
index a277283542d..4f4a4cd0840 100644
--- a/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
index b5ff1ba822e..293564a0d33 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
index 97b66d7c7e1..a6a44aceb27 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 6c6adccf89b..e708a400ccf 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_argument.h"
#include "ast_array.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 328b638b06f..085e7f1d617 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_exception.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index b5703032394..368763cd70b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_argument.h"
#include "ast_exception.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 0c53a5bc7e2..b2ef423353d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_expression.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index a03bf8a5845..0ef2385edad 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_expression.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index c671f048e98..8c9c04bb1e8 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ifr_removing_visitor.h"
#include "utl_scope.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index c349825d1d7..2aad7a8ff2d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "ifr_visitor.h"
#include "ace/Lock_Adapter_T.h"
#include "ace/Synch_Traits.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
index 46e38822075..6df2ecee70c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_IFR_VISITOR_MACRO_H
#define TAO_IFR_VISITOR_MACRO_H
diff --git a/TAO/orbsvcs/IFR_Service/tao_idl.cpp b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
index 90a26b11e50..d2db359f154 100644
--- a/TAO/orbsvcs/IFR_Service/tao_idl.cpp
+++ b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
index 76cf3adb984..4633fa0dfcf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Activator_Info.h"
Activator_Info::Activator_Info (void)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
index c9d4d40b0a7..704e489a354 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ACTIVATOR_INFO_H
#define ACTIVATOR_INFO_H
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 17114c0d580..2023bcad320 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Activator_Loader.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index f0b42a0cf9f..0b1f2231651 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "AsyncAccessManager.h"
#include "ImR_Locator_i.h"
#include "Locator_Repository.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index 36ed0e3ba1a..8ebeff1cc95 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "AsyncListManager.h"
#include "Iterator.h"
#include "Locator_Repository.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
index bb633f2851c..19a5712e239 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Config_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index c7f62fe55f4..af123997f1a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Activator_Options.h"
#include "ImR_Activator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
index cb60e0851e8..b636f001ac2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
@@ -1,7 +1,5 @@
// -*- IDL -*-
-// $Id$
-
#include "ImplRepo.idl"
module ImplementationRepository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 10f043d5dd5..8230a7956ec 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Activator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 0793a13aad8..8bdf98001ea 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Locator_i.h"
#include "Locator_NT_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
index a7577b44a18..004622ec009 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "ImR_Activator.idl"
module ImplementationRepository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index a3cb9866759..1ed12186226 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Locator_i.h"
#include "utils.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index c9ff837871b..ceae08cde08 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef IMR_LOCATOR_I_H
#define IMR_LOCATOR_I_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 1380a0a9df7..ee11052249e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults {
sharedname = TAO_Async_ImR_Client_IDL
dynamicflags += ASYNC_IMR_CLIENT_BUILD_DLL
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 3ec2ffc78ee..8cc68ded334 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LiveCheck.h"
#include "ImR_Locator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index c4f8ed397ab..4328605dad5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Loader.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 30e968b63ef..995b6fb5aad 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Repository.h"
#include "ImR_Locator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 653c8c09e07..723fc6a14f4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Locator_XMLHandler.h"
#include "XML_Backing_Store.h"
#include "utils.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index e3b2f8bc151..a8e19c37695 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Info.h"
Server_Info::Server_Info (void)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index bbd03927044..f5a0f183880 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Shared_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
index dc49b29f154..d59ca87d08e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Repository.h"
#include "UpdateableServerInfo.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
index bc41418eb94..17977954411 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "XML_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/activator_export.h b/TAO/orbsvcs/ImplRepo_Service/activator_export.h
index fcd22f8ccde..b434dbc2046 100644
--- a/TAO/orbsvcs/ImplRepo_Service/activator_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/activator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Activator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h b/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
index 5ae5cbc5e22..6dd31ac83ce 100644
--- a/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Activator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
index a19163be766..f39f1cfe3fe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Async_IMR_Client
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/locator_export.h b/TAO/orbsvcs/ImplRepo_Service/locator_export.h
index 8a3584386f1..3b194462894 100644
--- a/TAO/orbsvcs/ImplRepo_Service/locator_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/locator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Locator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h b/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
index 3016cfc767b..0f111fa3979 100644
--- a/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Locator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
index 45b72a2790a..2ef1d70b5ab 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "tao_imr_i.h"
int
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 9503b0b3da3..5eddf46cd03 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "tao_imr_i.h"
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 82dac4d7097..0a6eecbe417 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, lifecycle_skel, naming, trading_serv, avoids_minimum_corba, utils, install {
exename = tao_coslifecycle
}
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index 116bc02d955..85fb39b8d56 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Signal_Handler.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index 2f1989c1c6d..6cbeb210467 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Push_Handler.h"
#include "Monitor_Signal_Handler.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index ff0cf22f531..05ca0743fa3 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Monitor_Signal_Handler.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
index b1883c310b7..350101d7f79 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Push_Handler.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index c960ae4db9d..bd4eca32960 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Signal_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index ee4ab3dec80..58e5ffad727 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Basic_Logging_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 58d7c1b8cc1..d8094afeb0c 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Basic_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index 5afb55a219c..fcc9dad1dea 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dslogadmin_serv, valuetype {
exename = tao_tls_basic
InstallData_Files {
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index cf87be5880e..2bb30aa6cb5 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Logging_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index d78635182df..3a12a0d0a5d 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
index b334a0094ba..03bb8464465 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dseventlogadmin_serv, valuetype {
exename = tao_tls_event
}
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 8aa660e1b17..09df44ccbbf 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index c13b36fb8aa..0babac76263 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dsnotifylogadmin_serv, valuetype {
exename = tao_tls_notify
}
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index 35bec988776..0be23190c34 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "RTEvent_Logging_Service.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index e3bd76826e6..c2c6b65e1de 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "RTEvent_Logging_Service.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
index 99d165afa7e..a37690ec240 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, rteventlogadmin_serv, valuetype {
exename = tao_tls_rtevent
}
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index e23c4c968b5..c2adf6a50d9 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#include /**/ "NT_Naming_Service.h"
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 2829fe15b73..b649ea80844 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Naming_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 02f78e527f4..8bf80ec3966 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Naming_Service.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 1aee8f17aca..cb892d62c16 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
exename = tao_cosnaming
Source_Files {
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 846624a536a..a561076517f 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include /**/ "NT_Notify_Service.h"
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index a3a5ce79133..6a0394be9aa 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Service.h"
#include "orbsvcs/orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 2e5a38437ef..e9118f0a875 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Service.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index d23dd40674b..993fac76d8e 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, orbsvcsexe, install, notification_serv, naming, iortable, messaging_optional, svc_utils, notify_monitor_control {
sharedname = TAO_Notify_Service
dynamicflags += TAO_NOTIFY_SERVICE_BUILD_DLL
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h b/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
index 006cd9112c9..95946ed4d29 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 8a70f9bfb5f..90e27bb45ef 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Scheduling_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
index 9d3a4a959c1..3b5be0f1150 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver, utils {
exename = tao_cosscheduling
}
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
index 6dc278a02a1..b1f2f515f7f 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoexe, install, svc_utils {
exename = tao_service
}
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 50d75e2fbcc..d0eb5acb343 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Clerk_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index ea2454aad2b..bed1e69b2c3 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Server_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 5a984c18ae2..94303738196 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
exename = tao_costime_server
Source_Files {
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index af9a3d18e66..dcd98386e8e 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Clerk_i.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index a80dc435991..5adc3578fb1 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Server_i.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index e0067cc60db..10fa4ba2c46 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Trading_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index f604cdffdc2..16e00596670 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Arg_Shifter.h"
#include "Trading_Service.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index e6f950ecad2..3bc4eded25a 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, utils, install, naming, trading_serv {
exename = tao_costrading
InstallData_Files {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index 2ff7ecdb1d7..8577f90b070 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : orbsvcslib {
IDL_Files {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 6bcd6c8d280..718240449ca 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEventChannelFactory_i.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index da07a2dd6f8..8d725db9608 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEventChannelFactoryC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index a2e11f0c2de..fcee32c9c77 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FactoryDriver.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
index 0e342ef78dd..d55389dbb0c 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FactoryDriver.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index 4b9dcc1bf4b..2a5e66c6c4f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, event_skel, naming {
after += CosEC_RtEC_Based_lib
exename = RtEC_Based_CosEC
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index d9134d65ee8..7c9e7e02414 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RtEC_Based_CosEC.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index eb7a53782f0..6dbebc8de06 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ConsumerAdmin_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
index c0db68febea..90a04d18efd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosEC_RtEC_Based_lib) : orbsvcslib, event_skel, rtevent_serv {
sharedname = CosEC_RtEC_Based
dynamicflags += TAO_RTEC_COSEC_BUILD_DLL
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 5511ff6ae54..94fcde603e3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEvent_Utilities.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index 75fd15400db..fac4613996d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "EventChannel_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 2301272e0b6..72850567d31 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/CosEventChannelAdminC.h"
#include "orbsvcs/CosEventChannelAdminS.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 958e10373ad..0c3e1c89033 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/CosEventChannelAdminC.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 66800d52839..ba277070aa2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SupplierAdmin_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
index 4d2cbe378d2..080e7ee2a28 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 45711a26bfb..959aa21e667 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Basic.h"
#include "CosEvent_Utilities.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 7a9073af784..435888329b5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Consumer.h"
void
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 3ab573641e8..939e4d81b59 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
after += CosEC_RtEC_Based_lib
exename = Basic
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 4495a9bdd82..0a5b0f9bb35 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Supplier.h"
void
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 1656ddd70e2..c0f1633dd9e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Consumer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index dc533656fb5..83b383e0026 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
after += CosEC_RtEC_Based_lib
exename = Consumer
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 3093afb565f..bf465408a0e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple.h"
Multiple::Multiple (void)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 3bb98542efa..66dd5961a01 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Supplier.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index a622faa18d7..adedd3b2be3 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
index 9537776ef03..cf285141110 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Service) : orbsvcsexe, event, event_serv, naming {
exename = Service
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 324f5729357..1e8c46938e5 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 49d8c91f572..b23bcc5216e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index e1817ebd6e2..d7d41e6a634 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/CosTypedEventChannelAdminC.h"
#include "Country_i.h"
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
index 22056c72cb8..53585416aa2 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming {
exename = Consumer
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
index e4895d84c90..bd3dde4f6b7 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//IDL
#ifndef TAO_COUNTRY_IDL
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index aea93327e95..4a6b0e23017 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/CosTypedEventChannelAdminC.h"
#include "CountryC.h"
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index fbe3fb40a82..ec4c10d56e3 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
RolyPoly.idl
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
index e3dcb36c9a1..0de27980f0d 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*IDL): taoidldefaults {
idl_files {
service_config.idl
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 889e23c95c2..995ef08cb47 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple example, showing how you can load an
// ImR Locator and/or Activator as ACE Service Objects
// using the ACE Service Configurator framework.
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index 9bf463931ca..90ae5930611 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
#include "service_configC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index b6926fa148c..048c040e03b 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "dynserver.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index 94705cc7009..2cf2373b242 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DYNSERVER_H
#define DYNSERVER_H
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
index 459e4532891..32e36ea09c9 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s DynServer
// ------------------------------
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl b/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
index f4fb3363f8e..5e3226c5ffa 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
@@ -1,4 +1,3 @@
-// $Id$
// Just provides a corba interface to the ACE Service Configurator
interface ServiceConfigurator {
long process_directive(in string s);
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 71186f3df88..985e5be1557 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
#include "testC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl b/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
index 9ff40e9c6a9..9f1dcab2358 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface test {
long get();
};
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index 8b37a4c981c..e890ce2cc25 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
// It uses multicast to find the ImplRepoService
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index adb5efc8778..3b5c704863e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl) : taoidldefaults, anytypecode {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index ce75f2fc99d..07824aa8bc2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 546ec30fd68..041ddf9fbd8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RPS_Monitor.h"
#include "ServerRequestInterceptor.h"
#include "ace/UUID.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 9acee119ccd..2af202455c5 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerRequestInterceptor.h"
ServerRequestInterceptor::ServerRequestInterceptor (void)
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 3e8714ab864..dc9a42c1638 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 1ba89fe6b44..49c00ddf9f2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORBInitializer_Registry.h"
#include "StockFactory.h"
#include "ORBInitializer.h"
diff --git a/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
index 73476b098d4..fa59fccccff 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
+++ b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : orbsvcsexe, dslogadmin, naming {
exename = client
}
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 291d307e3e5..4902f70300f 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TLS_Client.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index fa9b4071031..f5fc7a9abe4 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TLS_Client.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index ce79fea9762..13b7f0b318e 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index e3e738174a8..80d40ebf367 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Supplier.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
index c96507ed65c..73b94cc0d1d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
+++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming {
exename = Event_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
index 9082517a64c..62cb293b63d 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
exename = Notify_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 7eb34e19523..72636dce089 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 637faeeea69..7040112fe63 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Supplier.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
index 83fed7aa672..b25dd200ea2 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, rtevent_skel, naming, rteventlogadmin {
exename = RTEvent_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index dbb42d94488..8dbbc806d8e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RTEvent_Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 5e77fc75820..b7e4f09ed25 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RTEvent_Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index 59ac860eed4..3d685ad9d1b 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv, typecodefactory {
exename = agent
after += Gate
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
index c813c802bc0..79a075f6484 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by
// generate_export_file.pl
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 0d4cef2fab4..7055c096e6f 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "Gate.h"
#include "ace/Truncate.h"
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
index f42ab5cc070..936e3a5b81c 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Gate) : rmcast, orbsvcsexe, notification, notification_skel {
sharedname = Gate
dynamicflags += GATE_BUILD_DLL
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index 5a09b937495..29ab07c63eb 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv, typecodefactory {
exename = craft
after += Gate
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
index 8918e07c037..a4556ce5fd4 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, notification, notification_skel, naming {
exename = Filter
}
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 8d2ef0f19c7..f1254a3e181 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 37aea1702ba..243b53b8b11 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 8697daeebd0..285db7c8a01 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Client.h"
#include "Consumer.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
index 072ed502b10..face8092307 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming {
exename = Supplier
Source_Files {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 43f68e43eaa..687fa6053ea 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Objects.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index f2344182273..d27314e6c6b 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index f453c3944e2..1dd31a372c0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 85245d221e3..096b868623c 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_Client.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
index 905afdd88ce..49e6acd9873 100644
--- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
+++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_ctype.h"
diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
index d32506ad621..9b38b2c9752 100644
--- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
+++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (mc_monitor_example): notification_mc {
exename = monitor
}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index da737f5f444..f5affa664ef 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Subscribe
}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index dbd64e04255..44a0a8e9523 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Subscribe.h"
int
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index d6f2f7f753e..3b0eca92ddd 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 0a72f5c06fe..d34251bb9b7 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Client.h"
#include "Consumer.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
index 94733de0d48..03710e2a00f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Supplier
libpaths += ../../../tests/Notify/lib
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 43f68e43eaa..687fa6053ea 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Objects.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index f2344182273..d27314e6c6b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 6335c57ec00..8defbca6e3b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 26e6d38c16f..faf55063b65 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_Client.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/ORT/Gateway.idl b/TAO/orbsvcs/examples/ORT/Gateway.idl
index f9b62e41070..e69ea1b2985 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway.idl
+++ b/TAO/orbsvcs/examples/ORT/Gateway.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GATEWAY_IDL
#define GATEWAY_IDL
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index dcb26d34621..d313390481f 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_ObjRef_Factory.h"
Gateway_ObjRef_Factory::
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 3845804c8bd..82ee26dc2f2 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
idl_files {
Gateway.idl
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index ae4ac1dd5ae..867dc575e85 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Object_Factory_i.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index 15762a58d6e..80aaf03d774 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file Object_Factory_i.h
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index e3fd27b471c..49a2906ce81 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_IORInterceptor.h"
#include "Gateway_ObjRef_Factory.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 005396f8a49..dd9dbd2940d 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_IORInterceptor_ORBInitializer.h"
#include "Server_IORInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 6ea98e2fab8..1832257174a 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVER_IOR_INTERCEPTOR_ORB_INITIALIZER_H
#define SERVER_IOR_INTERCEPTOR_ORB_INITIALIZER_H
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 679a8918339..ef121f69179 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "sum_serverC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index 66d9125c040..49d07e9d9de 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Object_Factory_i.h"
#include "Gateway_i.h"
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 743c38fc37a..63689117a76 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sum_server_i.h"
#include "Server_IORInterceptor_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/orbsvcs/examples/ORT/sum_server.idl b/TAO/orbsvcs/examples/ORT/sum_server.idl
index fdbf0b2a740..fe837b5bf51 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server.idl
+++ b/TAO/orbsvcs/examples/ORT/sum_server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module ORT
{
interface sum_server
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 25d3ee8dfd1..8ffe8517660 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sum_server_i.h"
sum_server_i::sum_server_i ()
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index 1d3101e97bf..730542b0aa4 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file sum_server_i.h
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index d0994c95d3d..a91010fce32 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 686b1110fa3..46beee50311 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 39bda637a4c..1e5908baf66 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
index 281f4775ed1..f241d1f4851 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer): messaging, rteventexe, naming {
exename = Consumer
Source_Files {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index b5fa6558f6a..71007b6620f 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 72ddfc327d6..6affe0ce442 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
index 79b652f0621..0439a997990 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: orbsvcsexe, rtkokyuevent, rtevent_serv {
exename = Service
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 9faab51f969..d5294b91bec 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Reconfig_Scheduler.h"
#include "orbsvcs/Runtime_Scheduler.h"
//#include "orbsvcs/Event/Module_Factory.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 69cadbb56ce..bebbcd0bf16 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 4c2f53f1b4f..2614ed8708f 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AddrServer.h"
AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 69b98c3b552..0fca147dffc 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 90e95851b3e..3028d6a29d8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "Supplier.h"
#include "AddrServer.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
index ec419f3bb13..bfb930f15dd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
+++ b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, rtsched {
exename = MCast
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 5ec77c0b47f..819a6caf61a 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4588a48aef8..4554ad6baff 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
Consumer::Consumer (void)
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
index f28dd9330a4..4ef22d036b1 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, rtsched {
exename = Service
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
index 5f4119984e8..83254f72da2 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 6f06d98c581..09820b9d704 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Reconfig_Scheduler.h"
#include "orbsvcs/Runtime_Scheduler.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index ae4549a37b8..3a97402ca8e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
Supplier::Supplier (void)
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 1edc1f633e3..59afb5c30f0 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
index 0982c19dbc0..adfb9d53a47 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Service) : orbsvcsexe, rtevent_serv, naming {
exename = Service
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index d941b8eb05f..b6132709bef 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 589dfbbcd90..9c7b5324b23 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 759335e549f..50bb40a03a0 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_Test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 47d992673fc..66f5acd3b42 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_TestC.h"
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index d40c741f314..a644b0db7cb 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_Test_i.h"
const ACE_TCHAR *ior_output_file = 0;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
index 2d368b64b38..df921283397 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
+++ b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Idl) : taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 43137bf8ab8..ab977303ded 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 48da3015992..0a1794867fe 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 5137d42bc91..e86fd97902c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.inl b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 3a3477f4d4d..bedc9ee8129 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(AV) : orbsvcslib, orbsvcs_output, install, property_serv, naming, qos, tao_versioning_idl_defaults, svc_utils {
avoids += ace_for_tao
sharedname = TAO_AV
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index ec1d5a1320f..5c6b24a29bc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/AV_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_export.h b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
index bfabf3dcde8..62afaf7464d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_export.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index fc424893e16..bbe3cfc9108 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP
#define TAO_AV_ENDPOINT_STRATEGY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index 26da6188ebb..f0b511711d2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/Fill_ACE_QoS.h"
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 2dabe381e62..7abe7aa92d8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//------------------------------------------------------------
// TAO_FlowSpec_Entry
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index dbe20c5849c..6aca9ffafce 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/MCast.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index 32fec051712..a5b375deb70 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/FlowSpec_Entry.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index a93b2545c49..e111b85e604 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 34acc9c7196..ef83a1898ac 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/QoS_UDP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 6b7a2376bf4..084d1fc8421 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/ntp-time.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index a1bb326b1ab..63fcc7c4899 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTCP_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index 5a5ea72523a..a60df3084ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RTCP_CHANNEL_INCLUDE
#define RTCP_CHANNEL_INCLUDE
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 9bdc89cf7a6..c2a0fa5b5c1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTCP_Packet.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 696378258af..4fe56cc5b30 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef RTCP_PACKET_INCLUDE
#define RTCP_PACKET_INCLUDE
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 6b41e6b2e53..a7378a76974 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -32,8 +32,6 @@
* SUCH DAMAGE.
*/
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index 68d97fb7735..d70ef01bb09 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/SCTP_SEQ.h"
#if defined (ACE_HAS_SCTP)
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index b6e0ef0cdf3..b0b10f58da8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/TCP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 6403b9dc602..909d9eb5657 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index a1676add764..601e173fdfc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/UDP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index 1e72b0acac9..19ec09132b9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/default_resource.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
index e6a32956169..60eeb6ad7e2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/*
* Copyright (c) 1995 Regents of the University of California.
* All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index 6df31d6cf67..17bea11966b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
/*
* Copyright (c) 1995 The Regents of the University of California.
* All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index cf517dc3b5e..20067f9e90e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/sfp.h"
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 308bcd713f7..cc2cd295b79 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ACE_CHANNEL_CLIENTS_T_CPP
#define ACE_CHANNEL_CLIENTS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 606a8cbae3a..997efb34aca 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = LIBRARY
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 64b0c672e3a..0056beb1e52 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// LIBRARY
// libTAO_CosConcurrency.so
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 4482671e3db..db4f396520d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// Concurrency_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
index 4406ec2e93f..f105e241ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
index fe99ece77aa..72c35e31de0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
index 5894da8e9de..730f9e841f4 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index d4120c81e06..50aad490694 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosConcurrency_IDL): orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 97b0de957d9..e99cace9d56 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CosEvent_IDL) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 0ad34e15760..cfd92db0be4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 6740acf67da..cc9fab516c4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 7780681aaf0..6ecde1dd993 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index ac830526779..a72aa1280ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 27f5e1c37d8..b46ef5986cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index a17ed20d9d1..4692f5f8790 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 9dc4b6b2f19..63b3407fecf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index fb424d87009..deda68038c8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==========================================================================
// LIBRARY
// libTAO_CosEvent.so
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index eeb89d93f1b..50fe4fd1094 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 79926396970..1b12a134671 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 3c26d56fa2e..625fade23c1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index fadaf6c2bea..305920b65ee 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index c1342545f4c..27bf794dd05 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index a5a977989de..f8891b2e576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Force CORBA::release(CORBA::Request...) prototype to be parsed
// before TAO_Pseudo_{Var,Out}_T templates. All required
// non-dependent names must be parsed prior to the template in
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index 84f62c99fbf..d66d3bbd78a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index b77ffddc7fe..d443ae002cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Note: This class controls the behaviour of consumers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
// to ensure the correct EC is referenced.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 4389bfb2314..8cff927de90 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 6d02ae32db2..f92360df4c3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Note: This class controls the behaviour of suppliers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
// to ensure the correct EC is referenced.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 6a5bba0262c..fadba6678b8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 2ad307d240b..865725f8b6b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 0f075e4bef4..c0e73d0ad34 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
index 5d16512df9b..d4840f5f701 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
index 3bc4d00b86a..b8f3586843b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
index f5194fa05a9..f687e04cf58 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 1820a1ecc27..cdadf90a475 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosLifeCycle_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_LifeCycle_Export -Wb,stub_export_include=orbsvcs/LifeCycle/lifecycle_export.h -Wb,skel_export_macro=TAO_LifeCycle_Skel_Export -Wb,skel_export_include=orbsvcs/LifeCycle/lifecycle_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index c408c79b7f3..56b9e6fe4ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosLoadBalancing) : orbsvcslib, orbsvcs_output, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_CosLoadBalancing
idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 4adbf7028f8..4704e6e3d9a 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNaming_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index f7b411099d9..4027c56bef5 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portableserver {
sharedname = TAO_CosNaming_Skel
dynamicflags += TAO_NAMING_SKEL_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index d55c710bdc4..8db67d6fa25 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNotification_IDL) : orbsvcslib, orbsvcs_output, install, event, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 0ad6f6c5c3e..cc8c14704a3 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosProperty_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 712e71e15f2..fe9d6c2202e 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosTime_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Time_Export -Wb,stub_export_include=orbsvcs/Time/time_export.h -Wb,skel_export_macro=TAO_Time_Skel_Export -Wb,skel_export_include=orbsvcs/Time/time_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index ad31677cab8..6b2243c4e03 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosTrading_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
index 0c634b97244..80b154784cb 100644
--- a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Daemon_Utilities.h"
#include "ace/Arg_Shifter.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
index 6f8a7d42aee..38cd86a6f92 100644
--- a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef _DAEMON_UTILS_H
#define _DAEMON_UTILS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 657348872be..db7be49f3d3 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, event, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 8e21e951446..c9ecec28b3c 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 940016b3e03..67465d70ff7 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsNotifyLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index 48e75601245..be736a7c572 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_BUSY_LOCK_CPP
#define TAO_ESF_BUSY_LOCK_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index b84042c958f..62fdae62ef7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_COPY_ON_READ_CPP
#define TAO_ESF_COPY_ON_READ_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 07aa3444b4d..fd1535e5e4c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_COPY_ON_WRITE_CPP
#define TAO_ESF_COPY_ON_WRITE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index bc317ef0748..5052c34c873 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_DELAYED_CHANGES_CPP
#define TAO_ESF_DELAYED_CHANGES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 934a360194b..29159239911 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_DELAYED_COMMAND_CPP
#define TAO_ESF_DELAYED_COMMAND_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index fc265f99772..37765884ca4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_IMMEDIATE_CHANGES_CPP
#define TAO_ESF_IMMEDIATE_CHANGES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 29aa2402b68..56ddea2d0a4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PEER_ADMIN_CPP
#define TAO_ESF_PEER_ADMIN_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index ad5c499c685..5ba55a59e4c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PEER_WORKERS_CPP
#define TAO_ESF_PEER_WORKERS_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index a0b52b8a642..47dc3e6d917 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_ADMIN_CPP
#define TAO_ESF_PROXY_ADMIN_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 1691a2dcc02..64154fe0806 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_COLLECTION_CPP
#define TAO_ESF_PROXY_COLLECTION_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 39d0c271894..ff57ce85e4e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_LIST_CPP
#define TAO_ESF_PROXY_LIST_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 3afe6bbc7e3..462e0542d1b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_RB_TREE_CPP
#define TAO_ESF_PROXY_RB_TREE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index f9d67c5a5e8..5ee83f5becd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
#define TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 2694b25b984..a60a7f02583 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_REFCOUNT_GUARD_CPP
#define TAO_ESF_REFCOUNT_GUARD_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 68274471b1a..adceefff7ec 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_SHUTDOWN_PROXY_CPP
#define TAO_ESF_SHUTDOWN_PROXY_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index ef8c4ad0f37..bf44a389032 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_WORKER_CPP
#define TAO_ESF_WORKER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/esf_export.h b/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
index a9c7cd1fd3a..f1182c3b970 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
index 50df688ca02..b52c4f60d5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Adapters.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 8b67077e1b3..7115d407a11 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index ea0ad2cdb97..a46244b6dfb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index df74a62ce97..b4968b356b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Complex_Address_Server.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index f3f35179378..47557ef714e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 5aac6d70046..970534d4332 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Mcast_EH.h"
#include "orbsvcs/Event/ECG_UDP_Receiver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index b97ffe9e144..a679bd3b058 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index a5a4218981e..bad8ff7df7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 3f076ddbb58..0ca681bb896 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 73e6ae0e2a9..1d1249873ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index 202c2540f6b..bce028cdd7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index a6d5f20ef27..b0e6e278d68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_UDP_EH.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 119d4cf8628..0d27483b7eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
#include "ace/INET_Addr.h"
#include "ace/Sock_Connect.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 869e623b18b..6ac398553b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_UDP_Receiver.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 410fc180797..91fdf765749 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_And_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 27e04d65611..8be15fbd97d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Basic_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index f5d247f36ff..1b9b0b086cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index a68adc7021a..8a7ca6dac53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Bitmask_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index 904bf799c30..4a3430d6980 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_EC_BUSY_LOCK_CPP
#define TAO_EC_BUSY_LOCK_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 1ee8109222a..84fdb2899bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index a6f15eac907..da902aa0dc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index c1b9f29b326..88687550c3e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index ec83a5c164e..be407512e4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index dad5e5bc70c..a4a3ab1b358 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index f7d07b20315..da8a8b21e9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 8b15c1a39ef..4654957fd54 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Disjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 1f42a3a762d..b5859e21960 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 44e52d115ed..35d689302dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Dispatching_Task.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index f8e9cd7023e..233169439f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 87227b52c6d..9747d1b82e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 13afbe4f81a..f3d296bed6b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 94628a5ff5a..f5534a16d02 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 24f7ce3a85d..01770ba6105 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Filter_Builder.h"
#include "orbsvcs/Event/EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 01c0f5c1e8c..6f9d31798ae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index f1d28246f74..d8287744bc6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index a10b2098cc6..df33e3292f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
#include "orbsvcs/Event/ECG_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 9cc898d7698..428104e1233 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway_Sched.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 77bd6021c07..e88563d6522 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Group_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
index e918d295929..8fbfc0adcf3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index d5e04983a7b..59be08f552e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Dispatching.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index b30a44d6b65..34adfa62c22 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Kokyu_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index e297ac02047..d7298071032 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 2c474004024..79c76c9860c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index a94a6f5728f..7d42ab54663 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
index a87c7a83d51..ffd84b5ba76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Lifetime_Utils.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index 360f6d11744..d164e06378f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_EC_LIFETIME_UTILS_T_CPP
#define TAO_EC_LIFETIME_UTILS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index d73fad387bf..e75e12bb54e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 55219040071..dc550ba2fda 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index b2b0c6b7f43..41ce09ab69b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Negation_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 8304b895e65..71411aa2818 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Null_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 4fde40b5ae8..05438b6adf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Null_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
index 60c72cb9e56..f1c2a48bd5c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3da8854d4b1..45475044d95 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ObserverStrategy.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 63824d13eda..0e9321ab8c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Per_Supplier_Filter.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index ab4cabf6723..855a58e620a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h"
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 16b71d22bd1..5f5eb1383f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Priority_Dispatching.h"
#include "orbsvcs/Event/EC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index d4e40a598d7..750d6dd82dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Priority_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 1743749c7a5..8260288b13d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 707dfe69374..23d9a366eb9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 522f6ad45e0..c824514b2c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_QOS_Info.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 3f2770ff0eb..cb057292fc2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
#include "tao/RTCORBA/Priority_Mapping.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 48e44f70852..01d6063199d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index d85bdee6d82..e23bf2bc0fa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index 1d384bd5092..f9011dc1df8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 369add84a12..070edd73045 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierAdmin.h"
#include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 9df36523c84..19acc6826e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index c24e66102ae..56c9af969ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Sched_Factory.h"
#include "orbsvcs/Event/EC_Priority_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 7828330e5c2..d85da896b8f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Sched_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 5625bf412b7..6db96184ed2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Sched_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Sched_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index edeafe0f87c..88ca6abf682 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 812865a639a..7ed8c79aad1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierAdmin.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 63c4e91e295..a24ce675bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index b606d150ec8..3534ca66a7c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index a06f36274f1..02b830ff850 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index e87f3619963..42931c188f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
#include "orbsvcs/Event/EC_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
index f70fb6aeac9..0668ec73009 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 2502bbbe980..d4904b5a195 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 4519384a419..cb1164d14a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 28489c6aa39..e234f48dcab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index d08f0c146ec..17a151c12e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Thread_Flags.h"
#include "ace/OS_NS_Thread.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 27161888e63..dde8279502e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#include "orbsvcs/Event/EC_Timeout_Generator.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 2b219948810..60278f39599 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Timeout_Generator.h"
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index b4f61f8a4a4..7dea70568b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 90e81d0293f..77bcb2af011 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 2700fcc4d22..5068fd0edfc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_UDP_Admin.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_export.h b/TAO/orbsvcs/orbsvcs/Event/event_export.h
index 87a6ddf5a12..d3529fff34c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
index a6f6ba465be..d9fc62aadfb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
index 70c88d4289e..3652a1f0e9f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
index e2af98341c2..35785ee1d49 100644
--- a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h b/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
index 9d56447dabd..db5edc21c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_RTKokyuEvent
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h b/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
index b9697e05882..651d719d91a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 5a2f1eeace2..aaee3390c4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index b4d23c389de..f14f104dffc 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_FTORB_Utils
idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
diff --git a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
index 044248938b4..b114898507e 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replication, install, naming_serv, naming, portablegroup, loadbalancing, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_FT_Naming_Serv
idlflags += -Wb,export_macro=TAO_FtNaming_Export -Wb,export_include=orbsvcs/Naming/FaultTolerant/ftnaming_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 3aac23ca003..99bbe325534 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FaultTolerance): orbsvcslib, orbsvcs_output, install, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults {
sharedname = TAO_FaultTolerance
idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index d3b138a0eac..6d962207047 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
index 37769e226ad..e136474d29b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ClientORB
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 3fd4f289aaf..697bfb25d95 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index d48d2676c1a..2db58389364 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 8566f4f5c7c..11844309254 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index d3ab4c835d7..10f9aa9c141 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
#include "tao/SystemException.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index e4ec2ec96eb..fd5333e870b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 6ae26e008ca..638686d0048 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
#include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 3e94b92af6a..6193f8a3733 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
index f492009ae85..40cf285750b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ORB_Utils
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 0de8565abfa..079a6ae3582 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
index 565f0b73165..473cb6fbd5e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ServerORB
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index 3e9074a07c2..39bfddf8c53 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index ef5754b47b4..85e8eabfff0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
#include "tao/IOPC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index 46af5f23fe9..e48abf59844 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 9c2431b8e15..3b584bae7fb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 0f2f1e1d1d6..e4ab0334684 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
index 2179965445a..96eb6be4394 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtNaming.mpc b/TAO/orbsvcs/orbsvcs/FtNaming.mpc
index c36764fa984..54b2aedde50 100644
--- a/TAO/orbsvcs/orbsvcs/FtNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtNaming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtNaming) : orbsvcslib, orbsvcs_output, install, naming_serv, portablegroup, avoids_minimum_corba {
sharedname = TAO_FtNaming
idlflags += -Wb,export_macro=TAO_FtNaming_Intf_Export \
diff --git a/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc b/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
index 4333fa87799..02d0972ac8c 100644
--- a/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtNamingReplication) : ftnaming, orbsvcslib, orbsvcs_output, install, naming_serv, portablegroup, avoids_minimum_corba, ftorbutils {
sharedname = TAO_FtNamingReplication
idlflags += -Wb,export_macro=TAO_FtNaming_Export -Wb,export_include=orbsvcs/Naming/FaultTolerant/ftnaming_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index feb3e0f3d04..5ea27b77fab 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtRtEvent) : orbsvcslib, orbsvcs_output, install, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults {
sharedname = TAO_FtRtEvent
idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index 1be01bbea6c..9e9419bd0af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index f21c6f11bcb..2437068b3eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
#include "tao/MProfile.h"
#include "tao/Stub.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 35b4c304d90..8c4824aad36 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
index 9dad27d931a..0733d263717 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FTRT
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index ffb6e29e2bd..80a00b4b270 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index b58fe8c42f4..8a8416ab398 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 846efb58bac..4c9a470ec4c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 928cb376771..cf79e91b2a7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
index 3278a9ce899..ca23b8611f3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
#include <assert.h>
#include <algorithm>
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
index 7f567ab80bb..f33c60ba71e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index fe440c891cf..2fe7edd1eaa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 7e7121b0c88..3ed1b7628f0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Dynamic_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index d9ba04ecf48..46bda339433 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index 2290a1bebfd..6056a120fe9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index a05cebc669f..5bda4749140 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -1,6 +1,4 @@
-// // $Id$
-
-#include "orbsvcs/Log_Macros.h"
+// #include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 64aff6a04ba..7d74d1cd4fc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h"
#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 443c3dac7ef..6701e3ad7cd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 39a4175c5c5..34b5848c15b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
#include "../Utils/activate_with_id.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index e417eb44182..0240e85014c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
index 9666d6e5480..95e4e90915e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FTRTEC_SERVICE_ACTIVATE_H
#define FTRTEC_SERVICE_ACTIVATE_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index 25ae47a7977..e8f4ae86d5f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/PortableServer/Servant_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index f1d3cf998bc..a2734de4911 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "tao/PortableServer/POAC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index f7829740eea..8f04f5d83be 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Reactor.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 7a7e9b870df..7485754612d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index 2760efbcee2..dce113ccd3a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index a7543bc8a0d..788a65217af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index eef8424fbdd..8796c03aca0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "ace/OS_NS_string.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 4562cb95160..2971584dfe6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "../Utils/resolve_init.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 9c82cab7c45..f3cc27ee85e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
#include "tao/MProfile.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 15b46f005a0..b1ea8b8744e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
#include "../Utils/UUID.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index 4ca242fd20a..97c83c66083 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index e70726ca265..ef2a6118cf8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 8c9e8dce508..9aa01c5311c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index b9bf488c9a0..9f43f278154 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index 357a2396f9b..f6c0611358a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index ec58a65597d..d187dcbbf7b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
#include "../Utils/resolve_init.h"
#include "../Utils/UUID.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index ec06fa1097e..121fd873499 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h"
#if (TAO_HAS_SCIOP == 1)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 3bc8ec8ed10..e8db0df6b9f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "tao/CDR.h"
#include "tao/AnyTypeCode/IOPA.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index db3f9f2877c..51ef90738f3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
#include "ace/Guard_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 4c2d3ba285b..c62bf2a1164 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index a3d024e7eec..f820feb8adb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
index 2c404b4a134..848b4f59a83 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FTRTEC
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
index 4b684ac136b..76976f5950a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/Log_Msg.h"
#include "tao/Object_KeyC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 25a322dacb5..80a774bfcd4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
#include "orbsvcs/FtRtEvent/Utils/activate_with_id.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
index efd4b53376c..40d84f5e85a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
index f3133e01cbe..b5c776f74af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
@@ -1,7 +1,6 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtRtEvent
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 67bb0430ca7..c5a3b8dfb46 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
index 525a9ab4609..6c96dce9af9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTIOP_ACCEPTOR_IMPL_CPP
#define HTIOP_ACCEPTOR_IMPL_CPP
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index 30f1d954ce7..ff8a07a0be6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index ad5d9117789..1917da10b24 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index 2ec67810b5f..c599bddeeba 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
index 9101067b6ee..110885ef92e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTIOP_CONNECTOR_IMPL_CPP
#define HTIOP_CONNECTOR_IMPL_CPP
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index b7b4ccaf82e..f54168e2603 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
#include "orbsvcs/HTIOP/HTIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
index 858abf88a1a..18c22afc684 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s HTIOP
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index e390b46cef4..443def1b352 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/HTIOP/HTIOP_Factory.h"
#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
#include "orbsvcs/HTIOP/HTIOP_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index b792afb510c..ab4e94d9819 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 67e7a12097d..1f0ec2faa71 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 9b7f3935f58..7d5b6dd052d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(IFRService) : orbsvcslib, orbsvcs_output, install, typecodefactory, svc_utils, iortable, ifr_client_skel {
avoids += ace_for_tao uses_wchar // Requires ace/Configuration
sharedname = TAO_IFRService
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 83b3658a41a..c08eb8ef809 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index c099bfd8005..69bfa6d3606 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AliasDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 217dc001d4f..bbecccf97f4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ArrayDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 38e2c4e79f0..0691ca9449c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AttributeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 986d20bc47c..481e7e98677 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/ComponentContainer_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index 823de5e1217..bbbf8a5519e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ComponentDef_i.h"
#include "orbsvcs/IFRService/ProvidesDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
index 010b1a3f86b..63c10e9dc3e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index b446b9b2731..644bbc5af99 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/ComponentRepository_i.h"
#include "orbsvcs/IFRService/ModuleDef_i.h"
#include "orbsvcs/IFRService/ComponentDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 38359a44621..59229c7818e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ConstantDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index 181f0007e49..d991b8009bc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ConsumesDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 13962884ca7..360c1395929 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/concrete_classes.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 2e2430b4fe1..b80036b9164 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
#include "orbsvcs/IFRService/ValueDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index e4d3f6bc2a4..424f8674e3c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/EmitsDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index beeaaa4b4f6..9c6c11fa9ae 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/EnumDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index e6378e02778..94a36220fe5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/EventDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index fb09253aaee..bf67c03d0c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/EventPortDef_i.h"
#include "orbsvcs/IFRService/EventDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 987665fe35a..54a720bc9df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExceptionDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 2833d46a52d..649c86a069e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 659c10e789f..4c532eab20f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtAttributeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ExceptionDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
index 9c75add9a8e..55c6413a73a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index 45e40c2113e..0d7c2d6fbdd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 3c07539de7b..fea208127a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ExtValueDef_i.h"
#include "orbsvcs/IFRService/ExceptionDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index 8d5746aeb21..4ad931fe56a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FactoryDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 4bd3c1cdfa9..8a7abfb8312 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FinderDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index d6595766ee6..50a59fe7ca6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FixedDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 04f1a001796..97d7bc8c76f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/HomeDef_i.h"
#include "orbsvcs/IFRService/FactoryDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
index 7bf02f0ae7a..78c10859022 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/IDLType_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index eacb3615531..fa7b25f8c37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// DESCRIPTION
// This class allows for dynamically loading
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 571bb11b518..84938c8c2eb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// IFR_Service_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index a414a701c71..2ee9ffd3c7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index b14ea64add8..1ca4e7ece07 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_IFR_SERVICE_UTILS_T_CPP
#define TAO_IFR_SERVICE_UTILS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
index d01bb3dd710..1eca550b6e1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_IFR_MACROS_H
#define TAO_IFR_MACROS_H
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index fcba2cd91b3..4b4bf77db08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/IRObject_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 14f30134bf7..5a7cffef327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index ac79f5c8673..1baecb43533 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/InterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/AttributeDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 23a9aaaf2f1..d078ec7ca7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index a7da3cafef2..9f5b20010d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ModuleDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index b7d0b53a7c5..d3bdb5e3192 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/NativeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 2ddd93df9b3..73c79b50ff2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/OperationDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index 2a3d6dd42f1..dd6ba317df2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Options.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 8057cb13292..44af15021ad 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/PrimitiveDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index bdc5e6b600a..796f36acfb2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ProvidesDef_i.h"
#include "tao/IFR_Client/IFR_ComponentsS.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index a56cdb69f33..40f64d82e02 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/PublishesDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
index 1afe5aa9f03..2fadd038cd7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/RecursDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index e69d10de9d7..3711e269ef8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/concrete_classes.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index ebcb39f0971..3badf1b343e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/SequenceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 3cf74f3419e..d065fb17b9f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/StringDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 746c02d3d3b..a5586fd2f8b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/StructDef_i.h"
#include "orbsvcs/IFRService/RecursDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 21ce6101074..486c5fd408b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/TypedefDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index c4adc184db2..e77bcc3742a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/UnionDef_i.h"
#include "orbsvcs/IFRService/RecursDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index e61129af886..7c8b1435634 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/UsesDef_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index f26ac872e2b..178c524cd76 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ValueBoxDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index e03411570f4..b79502df952 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ValueDef_i.h"
#include "orbsvcs/IFRService/AttributeDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index a0684102f15..d446026e696 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ValueMemberDef_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 5fb533bf8c0..5c1227b73f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/WstringDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
index 4e1aed48095..c552ccad250 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 35691e93493..4e62181384b 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IOR_Multicast.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
index 3ceb2c30777..5a2617821a8 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
+++ b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
index 3cdab54cec4..080e6aefda4 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 2a0b92278e1..cae9a5df6bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
#include "tao/ORB_Constants.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index d603cbdb3f9..18568bc60e9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index f4b24ada9ec..e8b7ed58bdd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientComponent.h"
#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index e864c5988d1..89b0c581d9a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index ebc3a86b345..f0db0d42c80 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
#include "orbsvcs/CosLoadBalancingC.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 41217b5c678..0094a7f89cb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Component.h"
#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 150cc923d20..cd1014d001f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index ab02d2a1e05..7768d687e3f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 14f936db278..dab05290bac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 36c7c466dab..fbba4fb425c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 9e9dd6f6f8a..0492f39e912 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index a2c0736974b..506b720ddb1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 31a8295e90a..b82e476c630 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 7fd48a41d18..506deccc859 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 38f75a53234..5037d43326b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 17e3f69d17a..156e5ae770e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 393133e667b..90fda5e5db8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 2a51c58cc23..a84d6345130 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index c4929eb7211..96dcc7c5f31 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Random.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index e1d131551b6..cfddac5559a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
#include "orbsvcs/PortableGroup/PG_conf.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 0edb006334a..bccb7ac7c05 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
index 10ec8a56fe1..04a6eb5840b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 0b63a8e911a..27860277a4f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/BasicLogFactory_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 4344c106a94..d55c9656420 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/BasicLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 148855076df..abc0f9e0718 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index c20bd1280d4..bad86505f10 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/EventLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 7b3607043d0..16e8d79994b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/EventLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index c08a3d2475c..90bb1ee624d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index e12cfa7ca78..6ad7296b210 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_Iterator_i.h"
#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 8a6282c68a6..961c2839023 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 6dfcabcf013..1cbfed1dc8c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_LogStore.h"
#include "orbsvcs/Log/Hash_LogRecordStore.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
index fb31e17e4de..f8ca79e9617 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_Persistence_Strategy.h"
#include "orbsvcs/Log/Hash_LogStore.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 1030312d93e..751c18bdf8c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Iterator_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index e55967a9c6f..4a74572ba58 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogActivator.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 42be2a77a14..f9db2b037ca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogActivator.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 86f552fc827..0e49232f712 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index dfea7195131..dd2b50b8f31 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogRecordStore.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index c1dd0b9b418..50096e1a450 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Compaction_Handler.h"
#include "orbsvcs/Log/Log_i.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 529e9a2fca1..c6799199f43 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 070861f05c3..c5485ab1291 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
#include "ace/ETCL/ETCL_Constraint.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index d06f2f32ed6..2d93a53ee41 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Flush_Handler.h"
#include "orbsvcs/Log/Log_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index a90c290e339..0ea1c37ee15 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log/Log_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 977fee816fa..b9d834eafad 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 16bce9394ac..ab114d23ada 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/NotifyLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index a3d233de824..3ebc0c046a5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/NotifyLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 22c8d52bde5..db2aaaf9226 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index da181905372..1e26e39f1fa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 8e3b5959735..ffe4ebc38af 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/RTEventLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 8493b9c4f93..27929151778 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/RTEventLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 06fbbfa03f2..08f783e807c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.cpp b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
index ffbffee019d..109657aa113 100644
--- a/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log_Macros.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.h b/TAO/orbsvcs/orbsvcs/Log_Macros.h
index 5ef52e4aeec..7ff2d11aa72 100644
--- a/TAO/orbsvcs/orbsvcs/Log_Macros.h
+++ b/TAO/orbsvcs/orbsvcs/Log_Macros.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ORBSVCS_LOG_MACROS_H
#define TAO_ORBSVCS_LOG_MACROS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 2c6c4cc05c1..2266e5903fa 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BINDINGS_ITERATOR_T_CPP
#define TAO_BINDINGS_ITERATOR_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 4e677c31071..3fa33442554 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h"
#include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index a46e23c244b..6e1601e8070 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
index 4ca19e74c1d..e2c7b9f0a93 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
index 9b267d15590..4ebab318def 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Random.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
index 132d2a25d3a..cf8ce6ff34c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index 2428bfe6544..5258debc311 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
index d19b70cadfd..3841f3ab41c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
index e8a204363c9..6cdee6931de 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtNaming
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
index 6b52adde64a..03532f0b18d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtNaming_Intf
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index a3087e3483f..92255b51454 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 442cc47d70d..b1b7a9da824 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// LIBRARY
// libTAO_CosNaming.so
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index c5bb1016bee..1c1e39cca86 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ============================================================================
// FILENAME
// Naming_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index b1f46ceb5ac..dabfec5c7e2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 6d9aaad46a1..ad4a4f071ab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Persistent_Context_Index.h"
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index a1b4e08ef72..8fdbbec5cd4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
#include "orbsvcs/Naming/Persistent_Context_Index.h"
#include "orbsvcs/Naming/Bindings_Iterator_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 0ce4e46025a..994acadbd16 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index a56d9a03418..cef909af7c7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Storable_Naming_Context.h"
#include "orbsvcs/Naming/Storable_Naming_Context_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
index 78a91dd1a57..aab70bacbd3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Storable_Naming_Context_Factory.h"
#include "orbsvcs/Naming/Storable_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
index 3bc9c600e49..da1bd4d888c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
index 220b76294f0..7ad081f4c64 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
index aef94b094c2..b5c7082fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 55cbf08504d..3dc8a3af5fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/Admin.h"
#include "orbsvcs/Notify/Validate_Worker_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index d1a249052ba..542749dcc13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/AdminProperties.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
index 4f39ccb53e0..92043029904 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ALLOC_TRACKER_H
#define ALLOC_TRACKER_H
#include /**/"ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 1f0ef328be9..28871268029 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/AnyEvent.h"
#include "orbsvcs/Notify/Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 449328b0400..7f7780af34e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 34caef24451..0e0ca240abc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index d0ba4e34035..e0ff8ad2b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index 3c5b31d52a6..f30948eae05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 6f84f19e964..d130e72d1e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/PushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index d3a63c25dc0..69db801841f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Any/PushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
index fd77791b525..34098fab019 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Bit_Vector.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index bed549f7365..130e2fe785c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Buffering_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 931ffbf8bc7..d789e146bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/Builder.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 821b53650bd..b0f247456b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 5ed4b550015..4c45bd1404f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ConsumerAdmin.h"
#include "orbsvcs/Notify/Subscription_Change_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f7960fa9fdf..0e7c3617a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_CONTAINER_T_CPP
#define TAO_Notify_CONTAINER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 6ee12bec12f..1b1abd51aa4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/CosNotify_Initializer.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 2a03d60c994..6f79de052cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index cad7acc0732..a17a30f6aae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Default_Factory.h"
#include "orbsvcs/Notify/EventChannelFactory.h"
#include "orbsvcs/Notify/EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index 8b7eb98c875..3bec07b367b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Delivery_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index de873b0969b..1117bda47e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_NOTIFY_DELIVERY_REQUEST_H
#define TAO_NOTIFY_DELIVERY_REQUEST_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index ae1d262a9a3..b9a8c147a14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ETCL_Filter.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index a6d28b1e257..83223cc25c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ETCL_FilterFactory.h"
#include "orbsvcs/Notify/ETCL_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index 783892b8c94..0b75982cd13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 8947a8d539b..c0e30c6fe10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventChannel.h"
#include "orbsvcs/Notify/Container_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 33536380395..26c57aa73fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventChannelFactory.h"
#include "orbsvcs/Notify/Properties.h"
#include "orbsvcs/Notify/Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index eb5c4166582..7ee8a94b6b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventType.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 31d93b598a7..906e103d2cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/EventTypeSeq.h"
#include "orbsvcs/Notify/Topology_Saver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 61ad42ca002..e279d4f93e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Event_Manager.h"
#include "orbsvcs/Notify/ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index eb443c36ce5..4703cff5773 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP
#define TAO_Notify_EVENT_MAP_ENTRY_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 655bdb5d4da..09478a46c01 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_EVENT_MAP_T_CPP
#define TAO_Notify_EVENT_MAP_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
index efa5868c157..0bfdbf409ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Event_Persistence_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index b1fdb3ae7da..f4225943a3a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_FIND_WORKER_T_CPP
#define TAO_Notify_FIND_WORKER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index a3dfb15c323..eca1d32f6f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/ID_Factory.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index 89f4e5c1672..e43bf8d3057 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 362306c9e5a..3a420766747 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Method_Request_Dispatch.h"
#include "orbsvcs/Notify/ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 23ccc52f11c..519b1ff0a47 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Event.h"
#include "orbsvcs/Notify/Delivery_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index b7f8390fcc0..2a3cf610e46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Method_Request_Lookup.h"
#include "orbsvcs/Notify/Consumer_Map.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index e64ba1478b2..5a25e497aae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Shutdown.h"
#include "orbsvcs/Notify/ThreadPool_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index c0be8172969..14f93d48e73 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Updates.h"
#include "tao/debug.h"
#include "orbsvcs/Notify/Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
index 19db54e852f..cb7fb72b028 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Method_Request_Updates_T_CPP
#define TAO_Notify_Method_Request_Updates_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
index 09638e1e7f1..73e63738be3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
index d5d39a9ceef..1c7441ce69b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONTROL_H
#define CONTROL_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
index a990e30d17f..2dce7e4ea36 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/MonitorControl/Control_Registry.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
index 4af81970679..71b48b13451 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONTROL_REGISTRY_H
#define CONTROL_REGISTRY_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
index c7164c2c004..86f21431161 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DYNAMIC_STATISTIC_H
#define DYNAMIC_STATISTIC_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index d8b0fb9c771..cdee710b3d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControl/MonitorManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 60e58d1b9c3..c57f50caac8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORMANAGER_H
#define MONITORMANAGER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
index 313c191771f..2a9a03ec6ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
index e0371c48c63..779db3ac50f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOTIFICATIONSERVICEMONITOR_I_H
#define NOTIFICATIONSERVICEMONITOR_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
index 8116c9d96a9..348dedc6c8d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
index ef4d5a049f0..b93e4150e2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TIMESTAMP_MONITOR_H
#define TIMESTAMP_MONITOR_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
index b5d61ac9112..7882f275b2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_MC
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
index dc9f518bbdf..e946037365d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
index 33b9f4ea744..72063c91920 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
index 3bd05a1898a..6847580b12d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
index 69784a93035..b86bd4e1147 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORCONSUMERADMIN_H
#define MONITORCONSUMERADMIN_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
index 741b58ce04b..5b9b6f9470b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
index e4185d6a642..bde87202bf9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITOREVENTCHANNEL_H
#define MONITOREVENTCHANNEL_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
index 3cbd5a684a6..d3de46ab273 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h"
#include "orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExtC.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
index 82a2a20f7a4..311fb73d097 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITOREVENTCHANNELFACTORY_H
#define MONITOREVENTCHANNELFACTORY_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
index ddb18342519..e1b4a41102a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORPROXYPUSHSUPPLIER_H
#define MONITORPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
index 49fd09ee747..2bc12122e6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORPROXYSUPPLIER_T_CPP
#define MONITORPROXYSUPPLIER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
index cd07f0f4160..3ca80ef6ee4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORPROXYSUPPLIER_H
#define MONITORPROXYSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
index 8c09c9199ec..85aecff20cb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORSEQUENCEPROXYPUSHSUPPLIER_H
#define MONITORSEQUENCEPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
index e73e44a979e..b03d3ab657d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORSTRUCTUREDPROXYPUSHSUPPLIER_H
#define MONITORSTRUCTUREDPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
index 79d2314656a..b1e55e19a79 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index f15f886431a..568e731f16e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORSUPPLIERADMIN_H
#define MONITORSUPPLIERADMIN_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
index 32c928c1c3f..68be46bd690 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_MC_Ext
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 5f010a942bf..5eaa04c9ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Name_Value_Pair.h"
#include "orbsvcs/Notify/Property_T.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 0b61d939e73..e0f0a0a8b38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 82db9bbe20a..eb1e3c4e429 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
#include "ace/ETCL/ETCL_y.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index 8c4240d3562..f0af71d982c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index 1df38ad143d..21421e091e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index bf1a26405e5..44687d95c71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index d10cea93e9a..6648d5e5ffd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 4dfef2b2520..1f054b234fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
index a73b9be6a6c..25f53b08408 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Extensions.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
index 247e7655d40..485934e3506 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_NOTIFY_EXTENSIONS_H
#define TAO_NOTIFY_EXTENSIONS_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index 566d6e53a97..adb740a2803 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Object.h"
#include "orbsvcs/Notify/POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 38a12d5b0e9..b81da9bd7dc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 638f137837c..d76ad81625d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Peer.h"
#include "orbsvcs/Notify/Proxy.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index f6af479ef31..316f93a140a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Persistent_File_Allocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 4cbe789d226..73262ca1adc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Properties.h"
#include "orbsvcs/NotifyExtC.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 3c16c4a998d..27d5d57ae16 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/PropertySeq.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index a18ef874290..c34d6de91c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Property_Boolean.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 3bf8ec43400..db3745cf760 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROPERTY_T_CPP
#define TAO_Notify_PROPERTY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index c9a6215ad8d..a82555e7620 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Proxy.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index ba1cf392883..f6a54aefa5c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 7765c5c7ff4..3b329e4723a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROXYCONSUMER_T_CPP
#define TAO_Notify_PROXYCONSUMER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index aef2fa47d3b..46b2740b2e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/ProxySupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index af9dfa473e1..f65acbbb9c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROXYSUPPLIER_T_CPP
#define TAO_Notify_PROXYSUPPLIER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 5896124519f..8c73a057172 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Proxy_T.h"
#ifndef TAO_Notify_PROXY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 0c69b40abf9..4a5e67a70c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/QoSProperties.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index feb4243bef7..4437626e758 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/RT_Builder.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index a8d76ace45b..70a45839531 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/RT_Factory.h"
#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 9fa8eb470a7..575205e48a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/RT_Notify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index ae95372a1c5..e02725450a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/RT_POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 86502f17a4c..8967dd68fa3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TAO_Singleton.h"
#include "orbsvcs/Notify/RT_Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index b18a023dc85..b1e3488ab5e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Random_File.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index bcb6ba730c9..c23841d19cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Reactive_Task.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 9abb4399a7d..e95438ef6b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Refcountable.h"
#include "tao/debug.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
index d2168a2af03..c2a84f77284 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
#define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 9a5180f0331..bcaebbc7c1e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Routing_Slip.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 4c652a3a8b3..820ba315d17 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
#include "orbsvcs/Notify/Standard_Event_Persistence.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
index d796caafcd4..1d80681e510 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Routing_Slip_Queue.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 9912a881334..754cd9c72cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
#define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 5419484f854..8b394884503 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_SEQ_WORKER_T_CPP
#define TAO_Notify_SEQ_WORKER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 203f967e984..b5e9fc336b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 8e71cf47315..faf990d3aca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 2d68e2fa003..00a8f1805d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
#include "ace/Truncate.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index 692250847cb..227d634859e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
index 86623a3a2ef..42288ac9f09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Service.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
index 34275c453e5..0d6dc11b5aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Standard_Event_Persistence.h"
#include "orbsvcs/Notify/Persistent_File_Allocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 382c218fb2a..ea0aa2940e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index bd26cb6f700..c321d27da66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredEvent.h"
#include "orbsvcs/Notify/PropertySeq.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 6d468c28193..dbfe3ba3127 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 558bc94977c..4cf50ad0d2f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 331784106bc..69d2a6334a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 7a63b07e5bd..92ab7846873 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 2a6902f07a9..b2705c86d71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Subscription_Change_Worker.h"
#include "orbsvcs/Notify/Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index cc65384f911..1cb7f208491 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index d74bb377bda..30406d7453a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/SupplierAdmin.h"
#include "orbsvcs/Notify/Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 2a4f6d88ad9..eebc10e0b92 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ThreadPool_Task.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index 9b46dc770da..ed37ea1caca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Timer_Queue.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index cc1e944a3a8..ef42a417287 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Timer_Reactor.h"
#include "orbsvcs/Notify/Properties.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index 11736c14a7a..d061c815db5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Loader.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index 58341e40b4c..ec88590b269 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Object.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index 77adc658cb0..f8ba3dd7751 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Saver.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index 206db007990..c9fdfc61130 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Worker_Task.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 5809d42f63a..5285d07672b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Loader.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 271b176a985..4f7207d4118 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Saver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
index a9f27bf4d1d..5ce286c6bc2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Topology_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
index d17be740d41..7d811c8413d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
index ae5ef11a7b9..378ab5d6897 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_Persist
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
index ec47ee40ada..5134037ceda 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
index 52b01d16fd6..aab98c8a62e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h b/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
index 288a67cb67f..190e0219185 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl b/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
index 199b8d40398..e7e4b739af2 100644
--- a/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
+++ b/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Null_MediaCtrl
{
};
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 3d3a9deca4d..f4bf56d1aa8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(PortableGroup) : orbsvcslib, orbsvcs_output, install, naming, iormanip, messaging, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults {
sharedname = TAO_PortableGroup
idlflags += -Wb,export_macro=TAO_PortableGroup_Export \
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
index 10947ea7ffb..3612005ea7b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index ece5c0b0cac..22845604ce4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/GOA.h"
#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 103c0ccc3cf..444629713cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/MIOP.h"
#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index eb8926d3d3b..9e41c5915ba 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 66b3dd604ce..87f2526b88c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 6b0647da9a7..38065e3962e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 575362b9f4a..9ec99126a3c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Group_Guard.h"
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
index 297498d0f5a..f1ccf0d0267 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
index 041dcd7e9bf..2a975de02d5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index de149f4b401..91dd26c44d1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index e658eb7d75b..e1fdbd1a339 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 269b0b839e6..11507d48e19 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index 8dffab00f89..4586255f5d4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 6c2c4c4b77b..d68c41bbaef 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_Object_Group.h"
#include "orbsvcs/PortableGroup/PG_conf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index fa6173ad06a..9957b044b7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index b1e5cf40dad..ef2acaa24ea 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index e74a5d11f27..d7996e32488 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 56f9c43973e..06837541c94 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 2b66804cf46..4e73825d981 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/GOA.h"
#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 5d7a25aaa63..2fb3788fb90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Utils.h"
#include "tao/MProfile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index 414b3a1ccaf..e3555148867 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 51915a2a5b9..4fd1aabc5d6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 93a040194ea..2ff05ec9706 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index d23f4f3366c..ed7036f2259 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 1df45aa6f91..225346a2fa5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/Portable_Group_Map.h"
#include "tao/ORB_Core.h"
#include "tao/TAO_Server_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 22aae4554e0..5b26d25596a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index a8d0ddcf434..8a4113bcbdd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -1,6 +1,4 @@
- // $Id$
-
-#include "orbsvcs/Log_Macros.h"
+ #include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 5063badd746..0f810879769 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 39c99d3cc3d..a2eeaa473e3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index 2f4ba24ee23..465b82b3e27 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
index 04229fa4c30..ada29cd487f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
index 497055b8cda..71de66ca660 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index f0e54571e83..54a4d77aad0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 673f4ed2a92..f41d5f3116a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 307822d3fe0..e156ec4c373 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
index 8f1ebd3cc21..c72f45795f1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 38d39c17e91..a539bfecc1d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h"
#include "tao/ORB_Core.h"
#include "tao/Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
index c376b17438b..c9ae98313b7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/miop_resource.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h b/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
index 15494956536..54a65b92cc7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_export.h b/TAO/orbsvcs/orbsvcs/Property/property_export.h
index 7013fca3a56..98e798a8efd 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
index 593f9bc7d37..9227b6f9af6 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
index 60a4aa4fe46..4808476dd2c 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index c6b69d03d16..7d9cd252de0 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTCORBAEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtportableserver {
sharedname = TAO_RTCORBAEvent
dynamicflags += TAO_RTCORBAEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 170b7970027..c74dacd4a1a 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent) : orbsvcslib, orbsvcs_output, install, svc_utils, tao_versioning_idl_defaults {
sharedname = TAO_RTEvent
idlflags += -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 5ccb28ebc3b..c76704f4745 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, rtevent, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index a7031f0c0de..3493dcc67ca 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent_Serv) : orbsvcslib, orbsvcs_output, install, rtevent_skel, svc_utils, messaging {
avoids += ace_for_tao // Requires ACE_crc32
sharedname = TAO_RTEvent_Serv
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index e9f5730760b..0d53cb72298 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portableserver {
sharedname = TAO_RTEvent_Skel
dynamicflags += TAO_RTEVENT_SKEL_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 799823b6ce9..9d8400c0ae6 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTKokyuEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched, kokyu {
sharedname = TAO_RTKokyuEvent
dynamicflags += TAO_RTKOKYUEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index 7020e3ce481..9a2251ba3b7 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSched) : orbsvcslib, orbsvcs_output, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
sharedname = TAO_RTSched
idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index eae25696612..9d884976c1b 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched {
sharedname = TAO_RTSchedEvent
dynamicflags += TAO_RTSCHEDEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index 62da7d7d9bb..9ea30f98a66 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RT_Notification) : orbsvcslib, orbsvcs_output, install, rtcorba, notification_serv, tao_versioning_idl_defaults {
sharedname = TAO_RT_Notification
idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RtecBase.idl b/TAO/orbsvcs/orbsvcs/RtecBase.idl
index 193e6f65299..a767c3f920f 100644
--- a/TAO/orbsvcs/orbsvcs/RtecBase.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecBase.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file RtecBase.idl
*
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index ddbbea4405a..31de8afa157 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_RTEC_SCHEDULER_IDL
#define TAO_RTEC_SCHEDULER_IDL
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 89c1f23dd27..f90a7ee5404 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Runtime_Scheduler.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index 375cd3450d1..a22952b17a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 1e7a4804c0f..932159fd9ed 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index ba594109fd4..f920fe33b4a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index c722e802ca9..353c0b82c9d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index ab121b2166c..03f8216ea7f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 306896b9bcc..e357aade7c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index 1f8364db77a..e8842aa4a16 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d4e3c1a1dd7..49233b8b01d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 589439db114..99828bd5367 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index ae78b5fe44b..ea8462ccf68 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
#include "tao/ORB_Constants.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 32baeec78bd..05984766838 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 07bbe863916..c3f4ae47e22 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 601bc8e52fb..c0141239c3f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 9fafd66c03c..0f213596e92 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 8768012be44..fa555ada8bd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
#include <openssl/x509.h>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index ed02368b472..278c6aa27a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
#include "tao/IIOP_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
index 806577d0855..1ad1fe128f3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 0e03de8a1a5..d2197af7fc7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Factory.h"
#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index f0006fd8958..e6506e6dc01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index fab500c1f4d..0c1db080bad 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
index f20eb554f4c..0111b7f02ba 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP
#define TAO_SSLIOP_OPENSSL_ST_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index bd2cd76bdbd..8604d6ba2cb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index f9532b3596c..bed025cbb60 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
#include "orbsvcs/SSLIOP/ssl_endpointsC.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 9090daa0e77..fff54f524b9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 46d0b64bcc5..43db7edd65a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 33b43104058..ae00e1548a4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
index d06b1bf8923..50e7e290648 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MFC style projects on MicroSoft compilers require CPP files
// They can't cope with c files (as MFC projects are CPP by
// there very nature). Some other platforms incorrectly can't
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index d5142543382..38aab1e781d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef ACE_CONFIG_SCHEDULER_H
#define ACE_CONFIG_SCHEDULER_H
diff --git a/TAO/orbsvcs/orbsvcs/Sched/sched_export.h b/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
index 422a13eed9a..0d4cc9e02e8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 3e5492f41b9..c894c027050 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Singleton.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index e9dcddf977e..cb09a8fdabf 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Scheduler_Utilities.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index c50a6a01559..5918d69960e 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Security) : orbsvcslib, orbsvcs_output, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_Security
idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index 8ee9ee108cd..0b781ebc61c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/CSI_Utils.h"
#include "orbsvcs/CSIC.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 1519307d289..99e681eb61a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 0aa7c3d65c4..9d41415ebd2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL2_QOPPolicy.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 382f6570613..db6d6e756e5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Security/SL2_SecurityManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 41fde030644..525dcf71228 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 380cd4f9263..3cd971c403d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 547af03b869..82d65bfe788 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_CredentialsCurator.h"
#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index f1940488326..f8f99982eff 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 129ce8fca7f..2bdacf03186 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_PolicyFactory.h"
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index a31cdef7d67..582564c8aee 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityCurrent.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index 77208fa2c9e..2dfaeb1645f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 7dee871bd4a..a0cc037bf31 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityManager.h"
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 296197f3334..8ea7bb61737 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_Current.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index 6627d37f847..0a6350f675f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_Current_Impl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 273205b9201..750dcdf32bd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Security/Security_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 9462e58aa60..d377562f262 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_PolicyFactory.h"
#include "orbsvcs/Security/SL2_QOPPolicy.h"
#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/security_export.h b/TAO/orbsvcs/orbsvcs/Security/security_export.h
index af588c4850a..2e93f74d964 100644
--- a/TAO/orbsvcs/orbsvcs/Security/security_export.h
+++ b/TAO/orbsvcs/orbsvcs/Security/security_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
index 018e6daf69b..6532f0e3815 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
@@ -5,7 +5,6 @@
// Copyright (C) 2001 Adiron, LLC.
// All rights reserved.
// ----------------------------------------------------------------------
-// $Id$
//***********************************************************************
//***********************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index a85bd530c09..e9f076139da 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Shutdown_Utilities.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
index 2663a13d407..6f8d682a822 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -4,8 +4,6 @@
#define _SHUTDOWN_UTILS_H
#include /**/ "ace/pre.h"
-// $Id$
-
#include "orbsvcs/svc_utils_export.h"
#include "tao/Versioned_Namespace.h"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 78a46f3eac7..6f7018b328b 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Svc_Utils) : orbsvcslib, orbsvcs_output, install, portableserver, tao_versioning_idl_defaults {
sharedname = TAO_Svc_Utils
idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 94afc1b68c8..6336278865f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Time/TAO_TIO.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index eb61b4ce5f8..a87bc724459 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 5d413b0b0e4..d9fdf300e57 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/TAO_UTO.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 2c40eb6e7bf..d3fb66a6287 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Time/TAO_UTO.h"
#include "orbsvcs/Time/TAO_TIO.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 94e13e46de9..3264a707ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/Timer_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_export.h b/TAO/orbsvcs/orbsvcs/Time/time_export.h
index 53e8ff6bf74..14994d9a3a6 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h b/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
index 58ea4bb5dce..772743b6161 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h b/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
index 736fcf1456b..0817d82868d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/TimeService.idl b/TAO/orbsvcs/orbsvcs/TimeService.idl
index aa4259e9217..46335b8f1fc 100644
--- a/TAO/orbsvcs/orbsvcs/TimeService.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeService.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_TIME_IDL
#define TAO_TIME_IDL
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index 17224e40735..aa6bc96b982 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Time_Utilities.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
index 49315926748..d98246f4b90 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Time_Value.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 1f0cd227d4b..5205633818b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Interpreter.h"
#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Tokens.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 41eef2b6963..8ea8c4946c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Nodes.h"
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Tokens.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
index a40ff4d15da..800d6f6ba13 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONSTRAINT_TOKEN_H
#define CONSTRAINT_TOKEN_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 2eb72025297..8772fbd39d4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Nodes.h"
#include "orbsvcs/Trader/Interpreter_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 26aac49da64..fb982f6a424 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 6dcd797dc16..cb4632d1a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter_Utils.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 6e7c39acff6..db0a07ec5cd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_INTERPRETER_UTILS_CPP
#define TAO_INTERPRETER_UTILS_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
index bbef8857006..e4b33dfc15b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_INTERPRETER_UTILS_T_H
#define TAO_INTERPRETER_UTILS_T_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index d964707da75..9e1246a55a1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OFFER_DATABASE_CPP
#define TAO_OFFER_DATABASE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 43fdd82e222..465445a518b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Offer_Iterators.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index a1b62b70615..e98e2905485 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OFFER_ITERATORS_T_CPP
#define TAO_OFFER_ITERATORS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 39868924521..dfa174fb656 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Service_Type_Repository.h"
#include "ace/Lock_Adapter_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 9f7096d9df8..3d36b2862af 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader.h"
#include "orbsvcs/Trader/Offer_Iterators_T.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index f7876eab178..28c928f070a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 90b09d487da..a3720f2efab 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_INTERFACES_CPP
#define TAO_TRADER_INTERFACES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 5613f3a26ac..2c613786e29 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_CPP
#define TAO_TRADER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 75b59671a9f..c6c8a5bac55 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 9d1e8667262..c321b73ab89 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//===========================================================================
// LIBRARY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index aab21dbcb97..0eae04554d0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// Trading_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
index 079cf570be9..d938b2c881c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
index 187f4ab03cd..7ab7e2e8957 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
index 3b0f399cef9..a05787754da 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index 34b115a7633..04db73d2d4a 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_SFP_IDL
#define TAO_SFP_IDL
diff --git a/TAO/orbsvcs/orbsvcs/svc_utils_export.h b/TAO/orbsvcs/orbsvcs/svc_utils_export.h
index 3f004359ae4..87ff1e9107a 100644
--- a/TAO/orbsvcs/orbsvcs/svc_utils_export.h
+++ b/TAO/orbsvcs/orbsvcs/svc_utils_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 2376ebf01d5..70f4fe30cee 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index eb1cdae5378..784043e9fc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/OS_NS_stdio.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index add4328dc42..1a3227e308a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 57ce03b9cae..72507316dc3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ORBInitializer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
index 9a897e2a30d..fd8ce0985b6 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Performance_IDL): loadbalancing, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 64b74b48366..15b264d3e34 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 7e5fc2084e5..a2d731ec00a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RPS_Monitor.h"
#include "ServerRequestInterceptor.h"
#include "ace/UUID.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 7fba1a65442..15e2c5152ca 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/OS_NS_stdio.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index 9acee119ccd..2af202455c5 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerRequestInterceptor.h"
ServerRequestInterceptor::ServerRequestInterceptor (void)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 43a589e0c16..d9339f79429 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index b63cdad8681..55fe8e4641f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ORBInitializer.h"
#include "RPS_Monitor.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
index 3153f04339d..882c6b28f0a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 420805af0bc..77f774eeef6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
index e660f7a0898..a63f688dcac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 18e173ad97f..1720871c44f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 6a4e11c00f9..7c7e0fbe6cc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index 58137c53ff8..ee8faf6618e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index d45fea1df25..3eb381fbc20 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 7fb19a396fc..44cc2c67df1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "RIR_Narrow.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index ec0709c89f3..946e204ead7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 5aa0fa496d7..14ed3bef69e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "Implicit_Deactivator.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index 9123c061fc8..14389ee98d1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index b4197076226..fa37c2c2ee1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session.h"
#include "Implicit_Deactivator.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index b661e16884b..d33346276e0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session_Factory.h"
#include "Session.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 40a34cb65f9..76ac8596c38 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "RT_Class.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 2330cc8bf77..5eda28852ec 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session_Factory.h"
#include "RT_Class.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 0385a920b36..c171f2e6129 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index d0368c3eca6..d29ccb9964f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 22f9e9ac5fb..d9b23ee999f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
index e660f7a0898..a63f688dcac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index ae100a2c5ec..d9ab67712a4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "Client_Options.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
index 8fe531f77bb..e23103a243a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index 7dea662571a..fe3f2a7b1a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(RTEC_Perf): strategies, rtcorbaevent, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_RTEC_Perf
idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
index 7a32929cf47..4182dfeb960 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
index 7d7a080db9c..43c0a3036a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index f7d4b3647d6..edf9b208740 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/AV/Protocol_Factory.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index b9c2be19ed8..768ec577f22 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index a6c21d897ba..535103b0a75 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index f82c7d54ce7..87785bb6e65 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 9eef99a23e7..7ffb5d8cdf8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
index 09123c1dc14..9e0f86eac49 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe, strategies {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 91f32a04855..d96e98353b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 71e9e320dc4..49d8fc18d9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 36bcc66f281..d1f0fb0a603 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 2b30cbd763f..d612810bf05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index 5edcd5810ff..ee8214651a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 20113214d4f..808d78b1227 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 5620314dfa8..0901c0e4e69 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
index e7f0d165f23..6584c385973 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*ping): avstreamsexe, strategies {
exename = ping
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index a1b75c9e6f7..7df40cfa1af 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/AVStreams_i.h"
#include "orbsvcs/AV/FlowSpec_Entry.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index cdac9773b95..b538a2695fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping.h"
#include "orbsvcs/AV/Protocol_Factory.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index bdc6d955958..9911cbb775a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "pong.h"
#include "orbsvcs/AV/Protocol_Factory.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 969f03cded6..829afe4ed37 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 4001faf7df4..6d15aa43d28 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
//=============================================================================
/**
* @file receiver.h
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index d84ee471402..337b6154c70 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
index a8567ba6fe6..058cd0d8fec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe, strategies {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 625778d0a49..7a3d6b003b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
FTP_Client_Callback::FTP_Client_Callback (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index f01e1bad8bc..ca1ffbe22be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index ca5a98725f1..707c54a2bc7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
int done = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index c228fda780d..a20ed2ce30b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index a92bef825b8..b6fbd0d655b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 060c1eef8fc..7144b72f254 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 9fa41e91af8..568822bd25d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 616cbc1025a..5cec3a1236f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index ed83dcfa98f..15f68fb1acb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 32bd1714fa4..07e4c5001b9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d73d81073d2..eed33815360 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 5f4586d2548..27c0cc9c762 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -1,7 +1,5 @@
-// $Id$
-
#include "server.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
index 35695e3c38d..8d1f4f6bbe7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*ts) : orbsvcslib, portableserver, avstreams, naming {
sharedname = TAO_TS
dynamicflags += TAO_TS_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 9f6c885497e..ddae3e4cee1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -3,7 +3,6 @@
#include "ace/High_Res_Timer.h"
#include "ace/OS_NS_strings.h"
-// $Id$
//TimeStamp Protocol Object
TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index 0e773d911fc..f940cb1133a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -10,8 +10,6 @@
#include "ace/Service_Config.h"
-// $Id$
-
class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
{
public:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
index 13156aa6e0a..085f6cdbb82 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index e4c9cb5470e..4cf2470a51c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index dc27a8990d5..4c365693942 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
index 7f39cd838ea..412fd5fa003 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 5d4fd10e67f..1efe0bb67a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/AV/Protocol_Factory.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 369f3b60114..c5d8103778f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 8ed65fffbe6..f18d1b04631 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
index 8e3c9bc31fd..e27166a9ebb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 504052e660f..26ad37fdce5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_Stats.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
index cb317ac779b..6dda78254f7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Receiver_Stats::Receiver_Stats (void)
: samples_count_ (0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 534a008c52f..d1ee8185118 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index b8b2d490899..01cf1610ffa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
index 56c33140d0e..9a6057526ec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe, qos {
exename = sender
Source_Files {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index fea8a5ee562..a4b8f17c4d0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index aad582183d1..00d85f7ce1d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
index 426eef66b46..6a18046fbae 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): namingexe, portableserver, bidir_giop, utils, avoids_corba_e_micro {
exename = TimeServer
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
index f0a87b1dc8c..84d35e72695 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
@@ -1,4 +1,3 @@
-// $Id$
module TimeModule {
struct TimeOfDay {
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
index f256645266b..b2b20b0c84d 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1334_client) : namingexe {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
index ecf5bd1deb9..2f159e07481 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, ifr_client {
exename = client
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index ff3463de8db..46fc9e4d5d0 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/ORB.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
index 6a537e0a8d9..0a6298f7f43 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
index fff2e17959a..6510eb4b56c 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
long try_and_create_POA ();
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 9f0afee75c3..638a1f4fdaf 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
// In case this is a static build we have to force
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 03952a5d946..cc58a7f592a 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined BUG_1395_REGRESSION_TEST_I_H
#define BUG_1395_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 506f0220319..8c7cb5f2b56 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 383d446bfcf..5873276dd90 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl b/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
index 28796f76c3c..7e1b03e90e1 100644
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void testme ();
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 488d969324d..0426f182a17 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1630_testclient ) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, ifr_client {
exename = testclient
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
index 47a3dc1979e..9b0b5abdfc0 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test): taoclient, messaging, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
index a48dab43f20..38907d6b9f8 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ORB_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc b/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
index 73eec09226d..42fa3c9a9f7 100644
--- a/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver, messaging {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
index f59d039f530..e0ab3b5c441 100644
--- a/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "tao/corba.h"
#include "tao/TimeBaseC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
index 164917d0a85..691fa233a75 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, ftclientorb {
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 1d3c0dac05e..f4ead0a697b 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/corba.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
index c1e98ab7f9f..01a5460b8e7 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index bb65e65d76b..511c16107ea 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BUG_2247_REGRESSION_CLIENT_I_H
#define BUG_2247_REGRESSION_CLIENT_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 3b87dbd6560..ee0007dd5bc 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Manager.h"
#include "Client_i.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 05b1f719326..540af93a4ae 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BUG_2247_REGRESSION_MANAGER_H
#define BUG_2247_REGRESSION_MANAGER_H
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 95d4bc297a8..7b1749f6094 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 8d11653386a..a756c0ffed4 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index 12f537ff77f..d19daef2f93 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2247_REGRESSION_TEST_I_H
#define BUG_2247_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index e8b7128836d..746946abbaf 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index fe9454b050f..ab461eda26e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index c56953b89a6..0795ed687ce 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PI_Server/PI_Server.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index c45ace22ae6..2e3634eef67 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "client.h"
#include "Client_i.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index fd2ebcea20c..f8241ccd2f4 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2248_REGRESSION_CLIENT_H
#define BUG_2248_REGRESSION_CLIENT_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index cabcf8fbc13..b029a16325a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "Server_Request_Interceptor.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
index 0dea64769bd..6e73cc2d45d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
string remote_call ();
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index 68966fa125c..0a5dbbadef1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index f4873fc8871..392ba9fcdea 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2248_REGRESSION_TEST_I_H
#define BUG_2248_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
index a1be42b8619..1c47f47cd78 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableInterceptor.pidl"
#include "tao/PI_Server/PI_Server_include.pidl"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
index b13fc2104be..517408101d4 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index b5d5b8e6d6e..27b6c365b28 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
#include "ServerRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index 655ddbf58fb..c2425cca81a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 0ae6bcb47a9..ead055e510d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 1c3a986f0c3..949c7fe30e2 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 1dae1234895..53cdb4e4ec8 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index b29fc630c62..2ff69131f4b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
index 4138843a913..fc0268a0a76 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index eacb684044c..ef1519b4a3d 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index 894f0b52923..43d8a6a7c1e 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 58a197d2436..9b996a3abb6 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
index 15de5d453a6..7f9e26b8e7c 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
index e79f3b87281..710575bd17d 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
index 3c62609cc72..a495edb4b0e 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
void Server_impl::shutdown ()
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index cf80fb9115d..6823035d916 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
index a4eb0d418c6..552fbf18e45 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
index 5f02be738fa..7da5d7d8101 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
index 9847c190876..967133f6d18 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : orbsvcsexe, portablegroup, portableserver {
exename = uipmc_test
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
index 30465b13f50..fc0364928eb 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
index 4275aecbd97..b0bf27772f3 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 74d342ba8ab..25eac5e2ed5 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 2632105c7f5..a70b3b6b156 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index 7da2b3117cf..cf624587455 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
index 8b625257879..bc504db7277 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, fault_tolerance {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index a15d4b348e9..6fe6f190c88 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "Client_Task.h"
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index a94e38cec90..fdaebf1da66 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 3b0274328ea..eaa5b66865a 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "TestImpl.h"
#include "Server_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
index 027e6dd0a2e..881b0dddb18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "ace/Manual_Event.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
index 57202e9372e..654ce5fee9c 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
@@ -1,4 +1,3 @@
-// $Id$
// Just need this for standard includes - contents irrelevent.
interface Test
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index 08916607cda..f0be3e754a6 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "TestImpl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index 0573e057c49..6e31010ec83 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "TestS.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index a0d24d81fc1..783d061e8fe 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "TestImpl.h"
#include "Client_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
index d5170de178d..680902b1a66 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestImpl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
index 0ac923d77b9..1abfd2dbc03 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
index 8b92aae35ac..519524c7afd 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
index b82ec5dbf88..0fb3a5dd383 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index 567d1fd0e70..ba73cb16178 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NsShutdown.h"
NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
index d3f2259fc2f..fe585143468 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index 3eabba2654e..444ace92c12 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "Hello.h"
#include "NsShutdown.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 5671046c545..a0dc4495e41 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc b/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
index b72dbc872b0..24a4119ce14 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): orbsvcsexe, portablegroup, diffservpolicy {
IDL_Files {
Hello.idl
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
index 30465b13f50..fc0364928eb 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
index 4ca7b20773f..8bfff7b7d92 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 6f9554e3515..cb01b6ce8e3 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index b05a8f66f3c..5b6e3eb3f15 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Ensure that the PI library is linked in when building statically
#include "tao/PI/PI.h"
#include "TestS.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index db81c1d7630..3c1da0dded8 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc b/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
index 09375538ff5..44a5a349497 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index e4bc728b877..e2c58cf865d 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 0ce579a79e2..00e9c7af65e 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Ensure that the PI library is linked in when building statically
#include "tao/PI/PI.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 6aa822e5431..4600310435b 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc b/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
index 50536d4a2ca..87e93776896 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, namingexe, notification_skel {
Source_Files {
StructuredEventSupplier_i.cpp
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
index 2cafdc5041d..df3027a9c49 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
@@ -1,4 +1,3 @@
-// $Id$
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
index 06de5daa53a..7cf1bdd9bc1 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
index 74f821455e5..a6575d05a1e 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
index 47d9f348342..5095a179afd 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index ceb378aefae..d17f53abbe8 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index 4edfe313641..561676e19d7 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
index df513d49278..053fb8d0f34 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index 9be7bc4cbdc..1b5912e316b 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index 24a2c4424a3..b11df7abb34 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 376fb3873c7..152a368249e 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc b/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
index 37636b16817..4b117b0bbea 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
index ad01818d727..5f85729628a 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/ARGV.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc b/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
index 3cb30415b76..9316001f39d 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
index 32ec9db32c9..acb2b6a1aea 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index 5773b0d7be3..d4ee0cdc8a1 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
index 2201809a698..1fe5ec980c9 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
index a1017e32240..34e9ae8b7a4 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
index 7e8d81fbd08..db1b3a6a5ea 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc b/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
index e7134e3c6bf..aba79d896f6 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3486
dynamicflags += BUG3486_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
index 8a5b304e171..6be97192212 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
index e630ab370be..f47fe24306d 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h b/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
index 2b3b25ed078..40afd6fb48c 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3486
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
index 6da6a2ea136..b35654f41c2 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Naming/Naming_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc b/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
index 63b37d20812..8129eeadb08 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
index 8c25c69b51e..3c88fae18c2 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index fe0146360f8..c214c911fcc 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 2017e62d471..90979bacc9f 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc b/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
index 0ac923d77b9..1abfd2dbc03 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
index 8b92aae35ac..519524c7afd 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
index b82ec5dbf88..0fb3a5dd383 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index 567d1fd0e70..ba73cb16178 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NsShutdown.h"
NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
index 2c7da5f61d3..cc4ea47298a 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index 3eabba2654e..444ace92c12 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "Hello.h"
#include "NsShutdown.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
index 5671046c545..a0dc4495e41 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc b/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
index 953f52f8c53..9d88a13b790 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_corba_e_micro, imr_client {
}
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
index 88736989e5d..87d6eb3cdae 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestS.h"
#include "tao/Stub.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc b/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
index 4ec881e0b26..bfe192d2b21 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
//
project(*IDL): taoidldefaults {
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl b/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
index 5dcd0d25041..110f4e06635 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface UIPMC_Object {
oneway void process ();
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
index c89940b5559..6c69d0c40da 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
index fdfcba3226d..ba73b4a8f06 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "tao/Version.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
index 81ce69fb80b..9064ea21d21 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 95e4325db81..9b72cfaecad 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index b8156f3dba6..7fbc5c0a2af 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/* A Bison parser, made from CC_command.y
by GNU Bison version 1.28 */
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
index 72731e96919..ef7637ec990 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
@@ -1,5 +1,3 @@
-// $Id$
-
typedef union {
CC_Command *command;
CosConcurrencyControl::lock_mode lock_mode;
diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
index e2242dffa83..8cb9efec456 100644
--- a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
+++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CC client) : orbsvcsexe, concurrency, naming, svc_utils, iortable, portableserver {
exename = CC_client
}
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
index 85a9ef71ef9..4feaf617e78 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Disconnect): basiceventtestexe {
exename = Disconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index e2bde895acb..6ef684dc6cb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index b17aca95c9e..bcb8dfb4c0a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_Disconnect.h"
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index d3d9825a637..5310576888a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 415f034369c..72008720fa6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 5f04dc9119c..e683a8be7c9 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Random.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index fa4eba583c6..d404a69e6c5 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index 09866f67af3..1995a03bc09 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestEventConsumer_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
index 1672e88303c..67010b8eaf6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TestEventConsumer_i_h_
#define TestEventConsumer_i_h_
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 83b687dc51a..15a23d002cf 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestEventConsumer_i.h"
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index 4141fc73a6e..4ed805225d6 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosEvent Test Lib): orbsvcslib, event_skel, svc_utils, iortable, portableserver {
sharedname = CECTests
dynamicflags += CEC_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index cf49bf0f69b..2a800d6cd5a 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 841d66408af..6032d54f33a 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h b/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
index e583040b361..8fe792490f4 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 645249e32af..685fcba8db5 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECM_Consumer.h"
#include "ECM_Data.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 43136a67049..1294bcf411b 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index a6a580f0a65..d44792d6a43 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECM_Data.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
index 33218253383..ca7fb1e9fcb 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 5e85a0ee5d9..9c0adf80b8c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index cf6cedf110a..adaf3a06890 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index a73bce90105..ff6da66afa2 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): rteventexe, rtsched, naming, iortable, messaging {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index f4bbba4a267..6070cb41ea0 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "AddrServer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index df931b22a8b..59c1545b7a1 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef ADDRSERVER_H
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 4f6034189b0..9874912832e 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Consumer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 00001f37d6c..a3f09d10e17 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef CONSUMER_H
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
index 73788961680..038e2ae4237 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging, strategies {
exename = MCast
}
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index d4c4d253821..9dcad7cb70e 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Adapted from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Consumer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index ad2d5afda4c..c0e4a5641a7 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index dca5f9b3d8b..3f131c1d4fa 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef SUPPLIER_H
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 10b0777b219..ed75cb23729 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Mcast.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 52437fb8233..944e88002da 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
index 76d669aa442..6cebb48fc0c 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_Mcast): rteventexe, rtevent_serv, messaging {
exename = EC_Mcast
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index e7e6a91b20d..d254b7c1773 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Multiple.h"
#include "Scheduler_Runtime1.h"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 01e9f46e4f4..9ba503ad3fe 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
index fc410ce421e..b080fb8175d 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_Multiple): rteventexe, rtevent_serv, rtschedevent, naming, iortable, messaging {
exename = EC_Multiple
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
index a6de5dd6f1d..468d98c49cb 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
index 44b87de3f80..07979d4501c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
index 86089e80ff4..8919b8f99b8 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 9760a470f11..b81e9af1c92 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Consumer.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index b87e5707fde..61afa504683 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 1f801efd880..f61723b3279 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Consumer_Driver.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index fa8121e15da..9732e3d4558 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index d97704bf08a..20d679e4bd2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Driver.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index f629bfbcae4..1d8a800c539 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
index 591904a2129..ab48e18defe 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos[] = {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index c9b269f3945..eed3d2b98c1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Supplier.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index ddc36af837d..df062485bc0 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 9810214e280..bcaf9071e28 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Supplier_Driver.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 44ef3755309..960a697e712 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 88cd24961fc..315d6b03e94 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Throughput.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index e3a3ae718ff..9d2a48261b1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index ebbb7c450a8..53993798a4d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ECT Supplier): rteventexe, rtevent, rtsched, naming, iortable, messaging {
avoids += ace_for_tao
exename = ECT_Supplier
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index bc35adba8ca..a9fd87264e1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Atomic_Reconnect.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index e12521fccba..063f5556bf2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BCast.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 86be16f5328..a74ba7bdbe3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 1607d15d60c..f52fd4dbd35 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 0714f229a4a..3f773a72e5e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Control.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index cb3153210b4..72681c72a93 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
index 7e0cca0b454..6c8420c0686 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
+++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Reconnect): rteventtestexe {
exename = Reconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index f112f9f6d9a..35965afa1bf 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index a447a99d4a2..41ef8866b22 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_Disconnect.h"
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 0ec7aaa6dfe..cede269c38a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index f39b060867f..425b64dcf12 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Observer.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 77a600c59ef..b3b557a1c89 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Random.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index fca70e30dd4..2fdb2af44b5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reconnect.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index c0461b8125f..335ad144b0c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Schedule.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 7e308b5124d..960ee33ee13 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Shutdown.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 0dd7e45e059..638ea4c3101 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 3dc6d2d4c6a..93eea269c6c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
index 7d8a33bfb38..2fce887c080 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rteventexe, rtevent_serv {
exename = server
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index 1ae3cae880d..a741f4f6c52 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/INET_Addr.h"
#include "orbsvcs/RtecUDPAdminC.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index 68d8ae17590..a46f3074570 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// AddrServerMain.cpp
// Main program for a common Address server instance to be shared by all
// event channels
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
index e0ab8b490e4..5400a440bb2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// TestAddrServer.cpp
#include "TestAddrServer.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
index 1f87fb38a7b..a7314f653be 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// TestAddrServer.h
#ifndef TEST_ADDR_SERVER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
index 9c398b58046..4104d6e092f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
index d9c5af671ff..f179d3438c0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: rtevent_serv {
sharedname = ECMcastTests
dynamicflags = ECMCASTTESTS_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index 4d7b998dd0a..960f03e5911 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Wrapper.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 56b377c7878..09790573f91 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef EC_WRAPPER_H
#define EC_WRAPPER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 943195e2bb9..1163e50c20a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index c749c44b5b3..bbe81ff8729 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef GATEWAY_EC_H
#define GATEWAY_EC_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index 627efc6ee49..1152f870e47 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*supplier): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
index bc1faae8c3b..0332bc24778 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define A_EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index bc9c677cd1d..ee9c617cff6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
index b08cd796de1..775a4a438c1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index 5cba23a3414..75f2b10d2ea 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 6c01dd0482b..b57aa1d2c18 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 8708015e3d0..397f37adb0e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 288ce58931c..0417aa89000 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index a5d18cf66ab..99e1f474cce 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
index ab93a670215..3cba086c295 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index d7958d46f27..b0c06413c38 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
index 12b0a091d2f..b77d1b1923f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.cpp
#include "SimpleAddressServer.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
index 7c192e1c50c..526e7872927 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.h
#ifndef SIMPLEADDRESSSERVER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
index 45bca620bf2..d69e606d269 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index 627efc6ee49..1152f870e47 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*supplier): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 2738362a2a6..d1ac1fd8127 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
index b011869f364..078ee5f6a38 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index 5148c468c6d..288e98e620e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
index 6a6919f964d..d298e8b85bf 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define HEARTBEAT ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index 0c9d100ea8c..1b824a4341e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*application): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index 3ac17021462..25f0c2f5e48 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
index c426e38e928..10de886574b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 0413449ccfb..2d8f1b6b350 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Connect.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
index b0df7a26f09..f4f24d2e157 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
+++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Throughput): eventperftestexe {
exename = Throughput
Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 56f18c95d59..8c949bfcd1e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Inversion.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 12d25b6a41c..d44f1be20cd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Latency.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 9de21e581d9..156656a53a9 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index dddde59bcfa..bc9995de9dc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Throughput.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index b38aaa13633..bfba4462981 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
* Test TAO_EC_Thread_Flags encapsulation.
*/
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
index 18bbbbed5e8..476d1d3afe6 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(TFTest): rteventexe, rtevent_serv {
exename = testflags
}
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 7992bc6f951..e6dc0eababf 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AddrServer.h"
#include "tao/SystemException.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 89dd8c30951..c93d4f6dd0d 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
index 8bbd9069095..7f89b7fc045 100644
--- a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
+++ b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 1138ba409f4..2180da5fc08 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 2b94d185d48..c33e8119b9f 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "AddrServer.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 3a83d94c10d..19d88f50a89 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "AddrServer.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index af31c5bd30a..ff6d6ce4c89 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index cf78deb34e1..2c28ecdda5e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 35da042eb61..52ea5d4d378 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "orbsvcs/Event_Utilities.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 10347f90360..5b389cac642 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Driver.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.inl b/TAO/orbsvcs/tests/Event/lib/Driver.inl
index f346e7757c1..0a23040f1dd 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.inl
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE int
EC_Driver::verbose (void) const
{
diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
index 4f3a25927b2..cf48d752239 100644
--- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Event_Test_Lib): rtevent_serv, naming {
sharedname = ECTests
dynamicflags += EC_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 8e0a7ea4629..a1877edb197 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/ectest_export.h b/TAO/orbsvcs/tests/Event/lib/ectest_export.h
index a6e9712d496..383ad6bad3b 100644
--- a/TAO/orbsvcs/tests/Event/lib/ectest_export.h
+++ b/TAO/orbsvcs/tests/Event/lib/ectest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 1c99f00f1fa..ae1ffb5ac3d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, orbsvcslib {
IDL_Files {
FT_TestReplica.idl
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index d220a23984d..9572565a286 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_TestReplicaC.h"
#include <ace/Vector_T.h>
#include <ace/SString.h>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 33c4ae7fdfe..cb90f1cdc6e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FT_ReplicationManagerC.h"
#include <ace/Get_Opt.h>
// FUZZ: disable check_for_streams_include
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 900a096e73c..1b1eccf7b6e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
/* -*- C++ -*- */
//=============================================================================
/**
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index 893a8bce90a..7aec5868fc3 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
Basic::Basic (CORBA::Object_ptr object_group,
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
index 5f8b3f58c4d..ce7b91b0499 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 92086c4ebd8..b2a7b5e77dd 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
index 432ccae5558..5e509d5c117 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc b/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
index eeab5127922..3a782579c18 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
index 149a73fcce4..883cd040bfa 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
index 777ce44f7e5..eb1707d6755 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 3c11da34eb6..be646b71269 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
#include "orbsvcs/PortableGroup/PG_Property_Set.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 323cd540ddf..603eb0086e8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
index 0c1338cb2fd..5276d5c9b41 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 8bf3f592813..370be8a05a1 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
index 258cddbe1de..36cb74661c1 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc b/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
index d4a8d42c12c..cf246863867 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : ftnaming {
exename = client
}
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 81eef2d3c0c..e8b2620e2a5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = DESCRIPTION
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl b/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
index 34ea5a9e113..90ec1af00d6 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -DCORBA3
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index fe9454b050f..ab461eda26e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 053d4054198..2ad6b91f3b9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PI_Server/PI_Server.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index b10636850e8..ada224e6656 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 428c66100ee..53c65dd74e9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
index 4bdf2f07c2b..3365b944bf5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 1d08ce00953..ca44b8bc7eb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index ed8c1b4122d..44b33d9fd24 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
index 18cca059edc..df93f9c5d43 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb, messaging {
exename = IOGRTest
}
diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
index 774382d8d09..012da8cf2ef 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
+++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer): orbsvcsexe, ftrteventclient, strategies {
exename = consumer
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index dd1428179db..fe641135183 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "PushConsumer.h"
#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 1be4464c3b5..802d415e6b4 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Event_Utilities.h"
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 653956af79b..2e4da10e414 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 38239fbc6b7..e1aac398307 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 667b818d227..0e3a8ca3df5 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index fe74f720fe2..449144691ff 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index d2bdb7e602e..9a23fdb768c 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index 55c56357743..8b1b5de842f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <ace/Get_Opt.h>
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index 8b81e46ec7f..8b2779e1a30 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index 01fcb2cd41a..84b84d7551e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
MCast.idl
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
index 44e31968528..efc5cfa1d2f 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module MCast
{
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index cc99975fe44..364b5a4c409 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MCast_Server_i.h"
MCast_Server_i::MCast_Server_i (void)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index f325761243f..231b7154fee 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MCAST_SERVER_I_H
#define MCAST_SERVER_I_H
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index f70cc79d142..5eb4632ea19 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ior_mcast_client_i.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index a9710c25b60..c8a5cdb19f3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ior_mcast_client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 57c6b415f21..67829f3be31 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (IOR_MCAST_CLIENT_I_H)
#define IOR_MCAST_CLIENT_I_H
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index 29d61bc4d7d..d12401d49a9 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 95d01f170db..626dd0d8ef8 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MCastC.h"
#include "MCastS.h"
#include "server_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Airplane.idl b/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
index ecc38afa7c5..2e683179e89 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Paper_Airplane_Server
{
string get_plane ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
index e660b75e889..4b61522e07a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
idlflags += -Sa -St
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
index 2bc3637b34a..57808678d6f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
@@ -1,4 +1,3 @@
-// $Id$
interface Messenger {
boolean send_message (in string user_name, in string subject,
inout string message);
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
index 3b7d0c625b1..f91e3d3036f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 8f450801ae1..bc8ddefc337 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Messenger_i.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
index dd804403c50..0cee65e9fe1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Messenger_i.h"
CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
index 0fadc985960..bcedf4b317c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
index 5a53724088d..6a6201eaed6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
index bfa13f84bdb..8a71f966081 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
index 3400c2e8568..d701d0c6ab4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index 96e5d8502bb..0e5de1cd8e5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
index 8bef96257c0..9403f78d008 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 0dd9ad68b58..b3894cc55a0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "bug_689_regression_i.h"
bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index b215bd5224d..700e4bac6d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef BUG_680_REGRESSION_I_H
#define BUG_680_REGRESSION_I_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
index 6475eb4fd19..06498e58b33 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bug_689_regressionC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
index 85218e307d6..9738d4495e7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index f926d157552..a8fa7f3af1e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(airplane_idl) : taoidldefaults {
IDL_Files {
Airplane.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
index c5a71e0cbca..ab765a05d9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index fe6eb88b04a..6d4dd83b8fe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
index 4528c671079..10f642b8e5a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Just implements a nice little Nestea server
interface Nestea_Bookshelf
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc b/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
index cf4a2b1804a..b87d1eb85fe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: notification_skel, notify_serv, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
index 681708b8423..c3c2d0fe65a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
index 6a20861ee2e..99b46560cd7 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index eb757b80083..ea728fbfe2f 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testS.h"
#include "tao/AnyTypeCode/Any.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
index d1046f74a6a..9f2ba1008e8 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
@@ -1,4 +1,3 @@
-// $Id$
module taoimrtest
{
module reconnectserver
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index e42e5b9f394..df6ec85f5a2 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "tao/ImR_Client/ImR_Client.h"
#include <ace/Task.h>
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 06f6c1fe2a2..d5776eec110 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ORB_Task.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 0487df28e12..8d781e5a64d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 7348ee24fa9..ff679e82b06 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IMR_RECONNECTSERVER_H
#define IMR_RECONNECTSERVER_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
index 366986b9076..bdbfdeb8cf8 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
index 1ff199e5a1d..0c7648f65e9 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "tao/ImR_Client/ImR_Client.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
index 3e16ed854f5..b29892067a6 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
@@ -1,4 +1,3 @@
-// $Id$
module Test
{
interface Dummy
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
index 0487df28e12..8d781e5a64d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
index 4c0e0ef2ceb..3b77ade88cc 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IMR_RECONNECTSERVER_H
#define IMR_RECONNECTSERVER_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
index 5860f3ef5d6..dd64e39a5e9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger
{
boolean send_message (in string user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 96bc33660d4..2b765fc66e3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
index 7c9099d475f..13c9135ec49 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MessengerServer.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
index 71c175c4dd9..29f5df44f15 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
index dec10fef0a1..40efe4f252a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 61cede2ee30..a3292254a97 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_client_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index a10f3868cab..5a258383764 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index a7323cc4414..0da2e262d73 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_server_i.h"
int
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 2a37963f76f..54aec2f16ad 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl b/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
index ac3641bd6d5..220db0f1724 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 04f3cff45e4..b1a7900a604 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc b/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
index aebf08d7ffe..ecbf751f07c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
index b6d02da96ea..5e4a71ad7b6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
index db920a2d270..9db181b2a3a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
index 75e21212960..c2412e04056 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc b/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
index 5ac2135b6b5..e503f89c727 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index dce997ea1a1..556e91f675f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
index bfa13f84bdb..8a71f966081 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
index 03d7c76a827..91d3a73d970 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
index 5a53724088d..6a6201eaed6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
index 978852bf41f..8c43ec1ef9d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
index abdddcb2b38..e455d14191c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
long server_pid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
index 1247543614a..fdf6eb9293d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc b/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
index 39fa2e96965..03ea47cc853 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 3833faa575b..0f1ea1a0118 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 507f97151b5..4b9fb0827fd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc b/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
index a178cdbfe1f..3cd0f58e9ee 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
index a6ece057589..1b530343a03 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl b/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
index a51ce7712f4..0e1f3354574 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void contact ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
index dc1cbfb2509..d670b0ad7c8 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 05a06dc9ca9..406f52b8c10 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_client_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index c508ff5f744..4c8b2fde791 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_i.h"
#include "tao/debug.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index c382406ccd3..f950bfcc84e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_server_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index fa4dd224022..5e81ec83a88 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl b/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
index 855d0afd9fe..6dd6cab10e4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
oneway void foo ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index 29986efd64b..d65dd22c22e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
index 5a758f7cf5d..2d05c7b556d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc b/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
index 1b37ca5769e..4a618c19d08 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index 0ea19b98057..fea63bc3cae 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
index c05ecbf1d64..87f2d592e05 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
index 158a6f6408e..a4d75a5e02f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
index c266b110909..9bf0ef6eb77 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 6a3f4d0832b..d884c5953d2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index 4f68b5cc8cd..6fc3d865a28 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
// Start with -orbinitref Test=...
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
index c3f1337cb52..41b656b76a4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index a765c5c1ae2..aef0c6ce98b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
int
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 2ce093714ba..04162699197 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index c8580df203f..1fbf4d27f2b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (SERVER_I_H)
#define SERVER_I_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/test.idl b/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
index 9ff40e9c6a9..9f1dcab2358 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface test {
long get();
};
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
index de7118f22e8..b38cc18e356 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// Return the number of the server after a delay
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index 49bef759b17..70a05ff6ac3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/TimeBaseC.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc b/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
index e8275b43b9a..57e1f598929 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
index a0739c28438..6e14af58b69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
index fc0520fa18e..bcfa43c6ee5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// Return the number of the server
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index 92d6c0803bc..b3a046998c2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 2b971eefbff..2a6ad20a2de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
index 11aab468634..f8b8931b82e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
index 294bfad5aa7..33bd08b6fa7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 17ed01fa517..7f709cb03cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
index 4b3a27efbbd..1ac34448543 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
index 5ac2135b6b5..e503f89c727 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
index aba13d6261e..8c4111ce643 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, svc_utils {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index c579d5e1fc3..1e834114576 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ifr_dii_client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 04f3971aef5..dfc404651af 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ifr_dii_client.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 05ee08d24c8..1431163ea66 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef IFR_DII_CLIENT_H
#define IFR_DII_CLIENT_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 8470b696545..1b8fe6b409f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "orbsvcs/Shutdown_Utilities.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
index 8ac11a758fb..81dfc6c5dbe 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module warehouse
{
interface inventory
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index f8ba51d221b..c093f9714ca 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 1554203f924..606dd538ee0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testS.h"
// Must include this header file and link to TAO_IFR_Client.lib
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
index ea322c3966f..a5dc3af54ce 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// The run_test.pl perl script will check for the expected output.
#include "ace/config.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
index 2704eabe9bf..44f6059a4a2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef __IFR_NESTING_ARRAY_TEST_DEFINED
#define __IFR_NESTING_ARRAY_TEST_DEFINED
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
index 30905c16208..eefd4628659 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test_idl): taoexe, ifr_client {
exename = test_idl
includes += $(TAO_ROOT)/include
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
index 8230f0955fb..068ec360bd6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module C1
{
valuetype EB // NOT abstract
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index 19dde458bd5..6bb7e0f1aa9 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IFR_Client/IFR_ComponentsC.h"
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
index fa0bd0c8d2d..ef376c8c67f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test_idl): taoexe, ifr_client,dynamicany {
exename = test_idl
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
index 0983f644770..2280286b190 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
// TAO579
module m1
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index f75482473fd..c145440b16f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
#include "tao/DynamicAny/DynamicAny.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
index b79db9ce724..f738247d66f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __A_IDL__
#define __A_IDL__
module wtk {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
index e85ffb03eb2..84e0becd173 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __FMK_B1_IDL__
#define __FMK_B1_IDL__
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
index 0833334ffe1..a83f18f917c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __FMK_B2_IDL__
#define __FMK_B2_IDL__
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
index 2b7ceedfb83..9e6b22bae86 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index a6763a1a819..87e04510f2d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IFR_Client/IFR_BasicC.h"
// Must include this header file and link to TAO_IFR_Client.lib
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
index 42753283c2b..aaedcb4a1bf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
index c96c22fdd87..49114a42792 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#pragma prefix "omg.org"
module CORBA
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
index dfb837f92a0..aa1a649cc45 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST1_IDL__
#define __TEST1_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
index 46539e92bd5..23f5ecf0224 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST2_IDL__
#define __TEST2_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
index 0b6923509e0..9c81f0023e3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST3_IDL__
#define __TEST3_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
index c69559d7705..daa4da7f098 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = IDL3_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index a4e9f470c67..11539ae78d5 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "idl3_client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 5bb899c36d5..eab7f237b54 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "idl3_client.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
index bbb6c86a00e..5b0f1e6f623 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef INTERFACEREPO_IDL3_TEST
#define INTERFACEREPO_IDL3_TEST
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
index 55d1cb99edb..70b304ef4f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef __IFR_INHERITANCE_TEST_DEFINED
#define __IFR_INHERITANCE_TEST_DEFINED
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
index 2f15cd2ce87..a63aec0cf43 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, ifr_client {
exename = IFR_Inheritance_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 261138e3244..08cda98f1f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// The run_test.pl perl script will check for the expected output.
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
index bd5f0afea22..ff2e8502885 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index b2c994851b7..169226cdfe2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 5df03c2b300..2c78cb4a442 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "GoodDay.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index ad8c0363dd7..4f1d5283b33 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Admin_Client.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
index cd458dac258..a6c8ef89db8 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = IFR_Test
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index eec00db242d..7e8af09bf73 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Admin_Client.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index 8ee343888f9..b9353a4913c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Latency_Query_Client.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
index 19fe67004fc..c6809c76f00 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: ifr_client {
avoids += ace_for_tao
exename = client
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index 4e919008a6b..f556b7b9a63 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Latency_Query_Client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
index 2c9a5ad5cd3..0462398e841 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Persistence_Test
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index b1a5fab848f..c8f86a137ad 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Ptest.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index e55bfc1f40e..7d5829a5a78 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Ptest.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
index 054542a4b3e..7ed4d11e75a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, dynamicinterface, dynamicany, anytypecode, ifr_client {
Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
index f57bec82ddf..c3b791947dc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
index a09262aae89..ac8020ac93a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module IFR_Test
{
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
index 831fed1a8d3..5b6781319ee 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, portableserver {
exename = client
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
index fd4436446ba..6d43ddd2382 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 8d733337167..acb1480fcd9 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index 0ffd18e95b9..b269b4cd18a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index a167ce93a54..1366ea41522 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 88bc5f6819e..60136341346 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index eeb61688925..0f7ec95b13c 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
index fd4436446ba..6d43ddd2382 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index c0aede26ecc..86eb6d82c58 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index e7749681cc7..de52cba81eb 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index 546d0c60179..74fe151c85a 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
index 48c4148da67..a3a7a29b677 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
index bcb1292951f..6a6436928ed 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
index 24553e7f9eb..7467943027b 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Factory_Map.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
index 3b9f3ed923c..ce7a817aaa9 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
#include "Factory_Struct.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index a7367b2f44b..cef4b099a21 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_Factory_Server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 6bbc51ac1fc..6febfc8546c 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index feb230318fa..b5ce33978ac 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
index 7de73d898a5..b0c9daac166 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
index e7b491f6c55..749dc735dc8 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_Factory_Server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
index 2158e314e99..825b90899d6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 5615e8b55cb..8c7b5ca40c2 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
index 99a52abe6ae..057af095522 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
@@ -1,5 +1,3 @@
// -*- C++ -*-
-// $Id$
-
#include "Factory_Map.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
index 3b9f3ed923c..ce7a817aaa9 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
#include "Factory_Struct.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
index df26a140ffe..d24dbfa48ae 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 8a6c30869a8..6150e701400 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 22d5988dafb..50d02c2d857 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
Simple::Simple (void)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 4b7b468b90c..db548b84149 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
index 85c32ae81d4..96cef266e28 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index abf25b3e295..f8d659d18bb 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 1f3f96e5155..ea93044934d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
index d8dcbe0a298..c1d6a1b8999 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 6e779f63ad8..5180232ea6e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 6aeca31a7e0..1fef2a2c27f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
index 751fc1454c0..2f91ee8cd6e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Client): loadbalancing {
exename = client
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index c3920b4a410..b8ed792c957 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosLoadBalancingC.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 679a469b1a6..3069a36ed76 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic_Log_Test.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
index 3213ff1542c..3c004ba08f8 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, dslogadmin, naming, dynamicany, iortable, etcl {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index d3a01e870dd..ee028fe44c1 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic_Log_Test.h"
#include "ace/Log_Msg.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
index d7776aa5691..f52f7ea2240 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
typedef sequence<octet> Octets;
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc b/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
index 58ffc92e8ef..5066b917d01 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
//
project(*IDL): taoidldefaults {
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
index 71b6551358b..2ef2d5a4ef0 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index d5ad7fbbe78..71b4daec197 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index c29b43793c7..08f366bcb8b 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc b/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
index 71b6551358b..2ef2d5a4ef0 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
index 38b253edba4..64678a3a6e4 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
index c29b43793c7..08f366bcb8b 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
index 3cb30415b76..9316001f39d 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
index 32ec9db32c9..acb2b6a1aea 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
index 5773b0d7be3..d4ee0cdc8a1 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
index 2201809a698..1fe5ec980c9 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
index a1017e32240..34e9ae8b7a4 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
index 7e8d81fbd08..db1b3a6a5ea 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc b/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
index b16e0f4fdbf..d1608fd5662 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
index f8c640c8681..224d077e9f4 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
index 13162aebb44..201b71c6185 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index a6a95024e5b..a57ff18c887 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AdminProperties.h"
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index 5acfd2c15ed..faf9411bf1f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Notify ConnectDisconnect): notifytest {
exename = ConnectDisconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 290f38aded1..26893522ce8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.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/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 337cdd0bf48..f61f6e17edd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
index 7a7aa3a1a27..c810433a0d0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 882be5d2bf7..0fc5e03747f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 575f3ef3a49..6bbac66f859 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 9b566741411..8d8bb055f34 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/go.idl b/TAO/orbsvcs/tests/Notify/Blocking/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Blocking/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
index 7a7aa3a1a27..c810433a0d0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
index 5616aa1e83e..635350404e1 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
index 3b2206a0a7c..f8582085739 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 320d9f2849f..5853851ca20 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
index d900bd56fd6..63e19532fe5 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, notification, notification_skel, naming {
exename = consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 8ac58bf4e75..5ef26667930 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index c46fe141bd4..cc8af3b58e1 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 034ff5dcfcd..953f44ea5f2 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 400d97dfea8..821e496afbd 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
namespace CosNotifyCommImpl{
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
index 4c13530d03e..ce56a6d7302 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index dabaa4e737f..1ed574aff9d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
index f60e931f900..cb6e8daf637 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index dcff65c1ebd..2628c22c28d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
index 00263764bec..b008d0dd83c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
index 8657a7df797..8a8f2e3a0e6 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
index 9ff570e322f..c75a375c65e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 956e6538775..d434d603101 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
index f546e2df51a..5ecad9b514e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug2926
dynamicflags += BUG2926_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
index c6eae95b721..17b9cd35d21 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
index d3ada78bcad..db4f00390b8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
index b99136d8a76..99273a2d335 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug2926
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index 6f590f1bdef..5be7ee1c143 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
index fe66eb5cf6e..c56c45e20f5 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server): notification_serv, taoexe, threads {
exename = server
libs += Bug_3252
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 135271cae10..524a606b81e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
index 7a307a12eca..4a52e9f0384 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3252_DllORB_h
#define bug_3252_DllORB_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
index b9ec40223b0..3e34c0cda3b 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3252
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index ba665d506ce..9e7b4c3e842 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
index 2c4b8f96405..6757254a0aa 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Cons): notifytest {
exename = Consumer
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
index 061ee286b3a..f79dfe149f7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
index 74fb3b72ee2..da4f3935166 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3646b
dynamicflags += BUG3646b_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
index fd28cd1d69e..75e5e91adc6 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
index d2f46db4466..f8b9b829f6c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
index cc4d2dc3fa3..cebf11d087f 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646b
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index 2f5932b870c..2a8c410c42c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
index 124f44aef8a..c3186cc0dba 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Cons): notifytest {
exename = Consumer
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
index ad64a1153a1..6536b945fe9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
index 270307d4192..c0eb3b9104c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
index 501440fc990..a0b0054723d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
index 77bd3473018..0ab4afcd953 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646c
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index b04f8f0b770..78ac583c59a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
index db468aba6ea..fe01b4f6293 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3646d
dynamicflags += BUG3646d_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
index a8f6848d55b..67bd25ffacf 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
index 65e44829a85..f2df32f6cb4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
index 1db5de2778f..295b9c40c98 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646d
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index 92c0813c661..7dbb8a1f845 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
index 5e236565e37..ce084bc0650 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3663
dynamicflags += BUG3663_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
index 4eafe04a802..f9d682490a7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
index 16471c71b50..fbd190076d7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
index a83678a7094..484be445440 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3663
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index 209cdb31747..f76c8350b20 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
index ee94ec7adb8..3e93854ae8d 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, notification, notification_skel, naming {
exename = consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 8ac58bf4e75..5ef26667930 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index 1dc331eb2fb..3c46b033d58 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 647111c3284..50088af13f4 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
index 5d1188492dd..a9771fc9a44 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*lib): tao_notify_service, notify, taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3688
dynamicflags += BUG3688_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
index ed3197a9021..b7398ba4c0a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
index 4d9a562f20f..d24d61143d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
index f65a42384d2..596cb624502 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestBroadcaster.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index a75caa09996..7c743cbcbd7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef testBroadcaster_h
#define testBroadcaster_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
index ef196c28fe9..8a1fca47def 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestListener.h"
TestListener::TestListener(
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
index 90a5b3f2f88..ee832c1a759 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef testListener_h
#define testListener_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
index e21f515af82..823ea799fd8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3688
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index e5bc65f9de8..9c61a834f92 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
index 6f62f78f0c9..d1245604863 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Notify_Test_Destroy): notifytest, etcl, iortable, dynamicany, portableserver {
exename = Notify_Tests_Destroy
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index ef176697b7e..706a5152433 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index dd9c654fe21..71bdc4d9686 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index 2da67bbaed4..ec3c8a10898 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 6a847e4dd87..16973aee910 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 1f7f6fb57f0..76323b2cf52 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index d29d4721eb7..3b4e95cdb03 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 65ccb52dbb8..c32ac84d38e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/go.idl b/TAO/orbsvcs/tests/Notify/Discarding/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc b/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
index 3c939bb9475..2fb7ba70e5b 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
+++ b/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Notify_Test_Driver): notifytest {
exename = Notify_Tests_Driver
diff --git a/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc b/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
index cdb229fc2bb..0fca0305dff 100644
--- a/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
+++ b/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl b/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
index 86c64e05b6f..668dddd7875 100644
--- a/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
+++ b/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface MonitorTestInterface
{
enum Which { NotifyService, Supplier, Consumer };
diff --git a/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
index e379acc6e91..a9c877e8d12 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 5989ecf4601..9765a241f0f 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
index e5efded21fa..7f7ff4f8ef2 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 921d0e673de..6f3a741ea98 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index a01418fc4e5..a29ead0cf28 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 1f9b1bb3594..57d3ca6ec8a 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index e9079f7bd8d..911bb91a96d 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 2ba2db51a86..c2240ce41d0 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index d07ecd3689c..c7356386479 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 60719e71117..e70e8c109a3 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
index 686a92add20..92042cd18f9 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 603b8e6b1a6..635d393a0ce 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 5af7cd0b8e6..efaf293783e 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 4687bc05bbd..bec30a6d1f0 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 3ff196671a8..7529a8a8a21 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/go.idl b/TAO/orbsvcs/tests/Notify/Ordering/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
index 64f8381180d..c8053277474 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(supplier) : orbsvcsexe, notification, notification_skel, naming {
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
index 33f0e181f1d..40d8e014d94 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
index c2aca21a2c1..c0514382083 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc b/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
index b33e914ab01..04a6cbf0741 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*notify_supplier): notifytest {
exename = Structured_Supplier
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 4dc868c7be3..1dfc2c5ecdc 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
index 3b3f667954f..719c703cbe0 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*lib): orbsvcslib, notify_serv {
sharedname = NotifyPlugTop
dynamicflags += PLUGTOP_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
index 9e23199a111..bf53c0c9292 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_Saver.h"
#include <ace/streams.h>
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
index 4363e41b899..b6d3f2248b6 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_Topology_Factory.h"
#include "Test_Saver.h"
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
index fe7fbfbee28..ff8792bd7e6 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index c365a16f619..02f9125570c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Application_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index 40b4b622f9c..e1f9c3d1a34 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../lib/Factories_Define.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index 77977ac38cc..a54f3e06a7f 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_RT_NotifyTests
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 42f2427f0ba..88cda77d7ec 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_POA_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index ea665041c17..10a8b6ba093 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h b/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
index 356b8f92976..7b8bcfa8e64 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
index 0e4d776fe91..61ed4df3bb4 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): notifytest {
exename = Supplier
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 651d67b3d35..d8dbce65618 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index 5d5a9e17f90..1e13f412ebf 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 6a993cc4634..aa51d70f020 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index d26b4e145fe..5c552723a2d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index c260d5c1bad..58472fd6579 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
index 3513a3251b9..f35b95b7166 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 63ba5eae30f..75489877c5b 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 4a5d5d1375e..432b91c5077 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 82f5e383be8..eb04571a414 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index bee0bed91cb..ca4f4218f35 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 9905c621bb1..8a4a03bb408 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "goC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 1f69fde7e44..8007cf18b4b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// A Standard simple supplier.
// All filtering is done on the consumer side.
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index bb2f59ac0a6..6d3074d443b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 6a98b5c6eee..38a2e127f44 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Supplier.h"
void
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index da41e3a9064..8fee701f753 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef NOTIFY_PUSH_SUPPLIER_H
#define NOTIFY_PUSH_SUPPLIER_H
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
index a7e74492d15..9298e0eef81 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 5534cacfb58..eab4576c4e5 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "goC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index f432e1b2e91..a1be7c03cad 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Push_Supplier.h"
#include "goS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 8b86e1cdeb2..0135a6ce722 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Test_Filter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index decb3b34b47..ff86d67b4e7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Test_FilterFactory.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
index 5ea99aa09d5..bfef58a0550 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, notify_serv, rtcorba, etcl, dynamicany, portableserver, iortable {
sharedname = TAO_RT_NotifyTests_Filter
dynamicflags = TAO_RT_Test_Filter_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h b/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
index 055ee6f273f..33db0efd973 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
index 1d9954c9368..9faa3a457e7 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
index 7c75f2e34ea..6ff370a47a3 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index f358d6d62c5..fc060a2ffbd 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc b/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
index 4cf51f8be14..1ab3f3b7da4 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(tao_*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/sig.idl b/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
+++ b/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc b/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
index 1ebcf636372..1ebfe1a5ddd 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*proxy_dummy): taoserver {
exename=proxy_dummy
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
index 4e55535a11e..591774c371f 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
index 141f3252109..22e6ec1d53d 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project : orbsvcsexe, portableserver, notify_serv {
exename = main
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index afe3264bded..4f92d781e16 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Activation_Manager.h"
#include "ace/OS_NS_unistd.h"
#include "ace/os_include/os_netdb.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index d7d2f4b7575..3ebb4709a2d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Application_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 9e483b37962..96dff4a1d34 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command.h"
#include "tao/Exception.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index c3ee4624ec2..94c10a875ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command_Builder.h"
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index 792a1cf69bb..ecb1789c077 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command_Factory.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index a1f7102c400..ad72f569edc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
#define TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index ddb0f7ad687..f64c5988d5f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ConsumerAdmin_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 19e8d2357ac..a7bdfe5d17f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_Notify_Tests_Consumer_T_CPP
#define TAO_Notify_Tests_Consumer_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 93e07d08887..7d967fc85e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Direct_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a3dfe8a7080..e9c66c60d25 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Direct_Supplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
index 94e7f9bf7fa..09cff53f213 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Direct_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index c7a89a57acf..45850fbc5e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Driver.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 3f424e30fca..16745bb20e5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventChannel_Command.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 346d3876902..1822f47896d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Factories_Define.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 083b6711bb6..289a53b161e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Filter_Command.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 1524e8e0a3d..f78102f88ef 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LookupManager.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index 44b649dffb7..f86ec08f39e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index 502431afa05..4ee6384ffe4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_NOTIFY_PUSHSUPPLIER_H
#define TAO_NOTIFY_PUSHSUPPLIER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index 346a41a23e8..428172716f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Test_Client.h"
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 722f4833396..76c172dfeaa 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(NotifyTests_Lib): orbsvcslib, notification_skel, notify_serv, naming, svc_utils {
sharedname = TAO_NotifyTests
dynamicflags += TAO_NOTIFY_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 582dce71596..42a2d0a676d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options_Parser.h"
#include "orbsvcs/NotifyExtC.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 2012aeebbb3..fce46f2b1f9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.inl b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
index b29bbd147fb..a1bc9400b39 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Peer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index c93dd2a6af9..1e65754e8f5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Tests_Peer_T_CPP
#define TAO_Notify_Tests_Peer_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 0f81dbae0ec..39826b3cdcb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Consumer.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index beb4edbb007..d3971798566 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Consumer_Command.h"
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index eea04d1e903..78415f88ea5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Supplier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index a7b182245c9..893ec715baa 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Supplier_Command.h"
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 79ca0812d95..19e60fa7c72 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Priority_Mapping.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 79ef0239bcd..9358f2326ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
index e557d6a7eda..89273d380b7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "PushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index b01c70d6913..e32616ff243 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
index 9f9bf75ff2f..4905a13fec9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index f1fbdc1589c..4e6aeca4a33 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Relay_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
index d38d4639901..7718c184a56 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Relay_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 08e1ceff1db..a9d59c40b55 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SequencePushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
index d050292323e..fb7e92d6868 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "SequencePushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index e98fb96a64d..bdb78afc0d3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SequencePushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
index 507cd0b85c6..a973c1a69b5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "SequencePushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index df0a5070e30..45d6bd1add4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEvent.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index a63246fb1ed..3c47d0c1201 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredPushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
index 24e952b7ae8..67136e10e17 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "StructuredPushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index ec7504e106f..b5ef2bfc9f6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredPushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
index 12cb29daaef..237adce337a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "StructuredPushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 00bbda0d9e2..5735508d687 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SupplierAdmin_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index f7a32546bf1..6620ef54e39 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_Notify_Tests_Supplier_T_CPP
#define TAO_Notify_Tests_Supplier_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/common.cpp b/TAO/orbsvcs/tests/Notify/lib/common.cpp
index a7302904a08..08267c1047f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "orbsvcs/CosNotifyCommC.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h b/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
index 867568dfe87..d9b1856d12d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
+++ b/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index f9df5f787f5..0fafadb71fe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index e1654e3fead..b6ddc735664 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index a04c78eea3f..034893d48e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 11b00de9bcc..b6c264876fb 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index d8b969cc3b1..09358f9d053 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index aee14a0ca01..56e3fccb7f6 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 56488818be0..84d4860bb16 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 619fd2e21b9..f3a8e2059be 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Perf RedGreen): notifytest {
exename = RedGreen_Test
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index f700eb53af7..94ee157faad 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "RedGreen_Test.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index aff5657bd75..404f031adae 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Throughput.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 284e43e9fab..8fe449aaa8c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Throughput
}
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index b91b329392d..f83688d2cdc 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): namingexe, property_serv, avoids_corba_e_micro {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 4044d2734a0..261b126d520 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
index bbeedbc28fb..7f8fc156941 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 483b787c224..ddbf902f9fc 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = DESCRIPTION
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl b/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index 0667203a972..e18ea654f85 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Strategy_Scheduler.h"
#include "orbsvcs/Time_Utilities.h"
#if defined (ACE_HAS_QUANTIFY)
diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc
index 1473382f007..626c30e7701 100644
--- a/TAO/orbsvcs/tests/Sched/Sched.mpc
+++ b/TAO/orbsvcs/tests/Sched/Sched.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, rtsched {
exename = Sched
}
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 8726ac155a7..d29a5967756 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program performa a simple scheduler configuration run,
// and dumps the results of one scheduling into a C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
index b6e2386a134..9bf7c0fdb33 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, rtsched {
exename = Sched_Conf
Source_Files {
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index bf367eee839..fcaf868bf25 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program performa a simple scheduler configuration run,
// and dumps the results of one scheduling into a C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index b221cecf8e5..1be4a63169b 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index e345717497c..55ef7703736 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program exercises a run-time scheduler,
// using the config run generated C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index 5b13c8e4912..73b37fffaff 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
index f12edc332f6..13991958b0b 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index c0fca6b8915..b52aafd103b 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 66d4d5c9ad9..ce7fd2a4524 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 6bb15414370..6eda29aac32 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index ffd4c35b7d9..e5807c9533d 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
TX_Object.idl
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index ea411dbe319..31219471c54 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TX_Object_i.h"
TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 7258aedbb7a..ac4b6f389cd 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TX_ObjectC.h"
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 06510884f27..44834a8ee36 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TX_Object_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
index f48d7df4255..717578a2c82 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index be296431912..62c288957bd 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index 0462946a1d4..2135a29cf6c 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "FooC.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 9bfc639bbfe..6612b8f50c0 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
index bb1644add55..754985b3b42 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
index 70735aec11e..3b1fc80dbd5 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger
{
boolean send_message ( in string user_name,
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
index 90042f726e8..3a955073aa7 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index ce03557b106..4e8623a4701 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
index 8fc0d7c7767..3dc01c36a13 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
server.idl
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index a45e7478e04..01c2927159f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "serverC.h"
#include "client_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index eea77b0a2cb..a78901c9e85 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "client_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 04cbecc6590..3df90db03c0 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "server_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 2b5031d8560..6bf8ec74eea 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
index 4fe6bed7041..7204731efea 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index 48599b596a6..cc3033c6037 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 8c6c7caecfd..667b02c61a4 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 137ca4f0ec5..c7ad6c5d87d 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc b/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
index ff9f19d2d47..76e4cff0f88 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test): taoserver, endpointpolicy, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index c5eff89d754..df9c4ed4ffc 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAC.h"
#include "tao/PortableServer/POAManagerFactoryC.h"
#include "tao/EndpointPolicy/EndpointPolicy.h"
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc b/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
index 9cc76d7a701..9236c7c5cea 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test): taoserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 4a27792bf5d..3e18c075205 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAC.h"
#include "tao/ORB_Constants.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
index b9de35dbb68..38fbc74381a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
index 35f2360528c..00b43a9ed7d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "ace/Manual_Event.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
index abf16e115a9..b01992447ee 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Receiver_i.h"
#include "SenderC.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
index 043ed95d566..ce5b925c9e8 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Sender_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index 0b3846e0c1b..fcc3766bfbf 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Worker.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 191000e2b2f..4e2a3155138 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 97a07eb9c74..0d3f42a283f 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Worker.h"
Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index a819b37e393..d274c19202e 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index ab199af47fa..2e32f9cbe1a 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 98af071916a..73c17a55d6d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
index 51fb274230d..f112da15a38 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 5486e50e4e6..3f01c998b92 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Worker.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
index 865eb3ce855..9e5e77f28c9 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 97a07eb9c74..0d3f42a283f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Worker.h"
Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 39f3fc928d8..a20b3a72666 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index c4b03c65d19..889cb91a09e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index ed3db5f624d..4ed9fe098cc 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
index 9a32e7ec527..2fe456c27c3 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc b/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
index 17cb4d65c5f..130aadc7929 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
index 74a08a7095b..64e2e62e4bb 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index df429bfaeb2..5e4e5a88765 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 17cb4d65c5f..130aadc7929 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index e81a2cf2f83..2647e950bc3 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "FooC.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 3acd85c9486..d907397ce08 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index d994462047d..3e73bea0445 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
index fecd0a02ab4..8e721949f10 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/SString.h"
#include "orbsvcs/SecurityC.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
index e3c4ce4747f..b92b95e0b41 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index c35f9567dda..3db89d561de 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include <ace/SString.h>
#include <ace/ARGV.h>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
index a1b0a957433..1a9f0e6a240 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
index 902b2ae0c37..9070ed3509e 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver, utils {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 059cd8a60cc..c2d7b12b54d 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, utils, portableserver {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Simple_Naming/test_object.idl b/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
+++ b/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 2be670a4c2c..b6a9fc776d9 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc
index 94891b66225..e3d16314757 100644
--- a/TAO/orbsvcs/tests/Time/Time.mpc
+++ b/TAO/orbsvcs/tests/Time/Time.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*orbsvcs client): namingexe, time {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 463436ae292..b5ba042c043 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 273e74a2f94..08a54f19bf8 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Offer_Exporter.h"
#include "ace/INET_Addr.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 0280714f872..6cd1847283d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 51551c6760e..7998cef2b78 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Offer_Importer.h"
TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index b0355182cfe..65ff201dcc6 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 86272281d1b..b7d1d806e47 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service_Type_Exporter.h"
TAO_Service_Type_Exporter::
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index bda68c212e6..559833192f0 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index 8e20d0f6d71..fbd6b915254 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SIMPLE_DYNAMIC_C
#define TAO_SIMPLE_DYNAMIC_C
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 2836545113f..6951cad21dd 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index a5941185f59..ddc26953dba 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TT_Info.h"
#include "orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index ae8c99133d2..eccaeed01c8 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_TEST_UTILS_H
#define TAO_TRADER_TEST_UTILS_H
diff --git a/TAO/orbsvcs/tests/Trading/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index d518aa1b58f..9b6c296c98c 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
module TAO_Trader_Test
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 6804b173ad0..fd8c9f58fa7 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory {
sharedname = TTest
idlflags += -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index ecd6c299330..7d5990210fa 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Auto_Ptr.h"
#include "ace/Get_Opt.h"
#include "tao/Utils/ORB_Manager.h"
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index fdc74792313..f786547ff6a 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Exporter.h"
#include "Offer_Importer.h"
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 0392f4620a8..86b10a73b72 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Importer.h"
diff --git a/TAO/orbsvcs/tests/Trading/ttest_export.h b/TAO/orbsvcs/tests/Trading/ttest_export.h
index 630a38f0c14..1ee37c64ad1 100644
--- a/TAO/orbsvcs/tests/Trading/ttest_export.h
+++ b/TAO/orbsvcs/tests/Trading/ttest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
index 5544216a4a3..6d517a48aba 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
+++ b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module corbaname
{
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
index c48d6d35b4e..27863776777 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
corbaname.idl
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 21c5cea5115..e3908eeba4b 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "status_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
index a75454ff9bb..1d7b608fce2 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = tests_svc_loader
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
index 98043f2ab0b..264fbd4c4d4 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "orbsvcs/Notify/MonitorControl/Control.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
index 213b273e6e9..6734bc21821 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Control
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
index 25de9255cf6..7db7625d399 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
index 426a2040b71..fc142b10caf 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc_ext {
exename = MonitorControlExt
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
index 92e195cb2ab..531f0eabcff 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControl/NotificationServiceMCC.h"
int
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
index 4e1b666f42b..ce4b0888017 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Types.h"
#include "ace/Service_Config.h"
#include "ace/Service_Repository.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
index 9f3b718bb8e..9a9010291ec 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): aceexe {
exename = MonitorManager
Source_Files {
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index 1f64ae8d1a6..43c6d88e93b 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
index a44c60b4eff..f07edd0606e 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = NotificationServiceMonitor
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 4edac9d8953..d1a0548613c 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "ace/Monitor_Base.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
index 41479ef7c07..cf595a82c78 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Statistic
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
index 55d7b01f6f3..2a93578e942 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
index 71d76943db6..40fa2b72c0c 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Statistic_Registry
}
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index 10c97dc3c24..30510235e30 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter.h"
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
index b19d12a3bc1..211a718bb4e 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: trading_serv, portableserver {
exename = Interpreter
}
diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index bbf480e5258..6ad88e19e89 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: taoexe, anytypecode {
avoids += ace_for_tao
Source_Files {
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index e9c076a49ea..10a1933687a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestInf/AppHelper.h"
#include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 21233a9ff7a..423ad03312a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestInf/AppHelper.h"
#include "TestInf/OrbRunner.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
index 3481f7068f7..c1a477b339b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestInf/TestAppMain.h"
#include "ClientApp.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
index ab02eb59e4d..1abeda27a22 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(csd_test_server): csd_pt_test_exe, avoids_corba_e_micro {
exename=server_main
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
index d0d2aa30fff..725172f35d3 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestInf/TestAppMain.h"
#include "ServerApp.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
index 0963cfd77dd..9a8597c428a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppHelper.h"
void
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index f0ab9e023b2..2aa73b80583 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APPHELPER_H
#define APPHELPER_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
index 3ff4b93526b..0491e01baba 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 5c059a8e5e8..03e04037a86 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APP_SHUTDOWN_H
#define APP_SHUTDOWN_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h b/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
index 91f36276272..0d74a2e6021 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_PT_TestInf
// ------------------------------
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
index 8f9afcf68de..379a8ce41d8 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CANCELAPPXCEPTION_IDL
#define CANCELAPPXCEPTION_IDL
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
index 361bb3cd465..221781e1b9e 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientEngine.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
index 088566ac96b..5141f3eede0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This may look like C, but it's really -*- C++ -*-
#include "ClientTask.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
index 794900c41ce..e5ad609a19e 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CUSTOMEXCEPTION_IDL
#define CUSTOMEXCEPTION_IDL
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
index 4f76953e24c..330914baa72 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOEXCEPTION_IDL
#define FOOEXCEPTION_IDL
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index 7653bd6a3c9..0e2dd6c9749 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "OrbRunner.h"
#include "OrbTask.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
index 4eb2f529e50..eab4b7b7013 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ORB_RUNNER_H
#define ORB_RUNNER_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
index dc4a387472e..8c8076e201c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServantList_T.h"
#include "AppHelper.h"
#include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index 72d643b74be..f7f5c727648 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVANTLIST_T_H
#define SERVANTLIST_T_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
index 0f89412cbc0..16a10887608 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestAppBase.h"
TestAppBase::TestAppBase(const char* name)
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
index 9752d227984..a3e2d64be32 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPBASE_H
#define TESTAPPBASE_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
index 2ac53939b77..f4cf0a8d88c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPXCEPTION_IDL
#define TESTAPPXCEPTION_IDL
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
index d179542c7c8..f6adba43d5b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPMAIN_H
#define TESTAPPMAIN_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h b/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
index 6d33bdbe291..6dfad070a8b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_PT_TestServant
// ------------------------------
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl b/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
index 41663869082..c3e27ab33ba 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
index d0e6dd72566..7f71bed1921 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_ClientEngine.h"
#include "Foo_Statistics.h"
#include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
index 6fe6e95fcff..043d87e48f5 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_Statistics.h"
#include "Foo_ClientEngine.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
index 118e5afd81d..8dd569d1543 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_STATISTICS_H
#define FOO_STATISTICS_H
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 15fc4cd2002..5aa94864344 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_i.h"
#include "TestInf/AppShutdown.h"
#include "ace/Time_Value.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 931bc8542aa..476b9e238cb 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_I_H
#define FOO_I_H
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 2d9fbe40121..d455880971c 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Perf_IDL): taoidldefaults, strategies {
IDL_Files {
callback.idl
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index f2ca5619ba6..6c8b0a5a997 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 11a5655f7a2..e646e2e3416 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_CALLBACK_I_H
#define TAO_CALLBACK_I_H
diff --git a/TAO/performance-tests/Callback/Callback_i.inl b/TAO/performance-tests/Callback/Callback_i.inl
index 8bfbbcf3dcc..18c2c0cad06 100644
--- a/TAO/performance-tests/Callback/Callback_i.inl
+++ b/TAO/performance-tests/Callback/Callback_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (int expected_samples)
: history_ (expected_samples)
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 1deaefea278..7751da4e5b8 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 87f5e0640ac..06948665fc2 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SERVER_I_H
#define TAO_SERVER_I_H
diff --git a/TAO/performance-tests/Callback/Server_i.inl b/TAO/performance-tests/Callback/Server_i.inl
index eab268f111e..e162f536d0a 100644
--- a/TAO/performance-tests/Callback/Server_i.inl
+++ b/TAO/performance-tests/Callback/Server_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Server_i::Server_i (void)
: done_ (0)
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 3ddedfa0c11..069c566552f 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback_i.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index aa4900c158c..e12195d755d 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index 8d4cfd0fb4b..7a9fac25699 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = client
after += IDL_Cubit_Server
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
index 68ce2b6165b..8f899ff99cc 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Cubit
{
// = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index b71c28d89de..4d2e8704bd0 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cubit_Client.h"
#include "RTI_IO.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index e7d09d1577e..b52869dc434 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cubit_Server.h"
#include "tao/TAO_Internal.h"
#include "tao/debug.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index fbbf398c02d..7c81e34f5d7 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, strategies {
idlflags += -Gd
IDL_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
index 9a208bc2eea..3177f9982e2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RTI_IO.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 63c45a894d5..6d1f4e8b305 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-all.h"
#if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 4b7fb83344c..06a9ba20ff6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Cubit_Client.h"
#include "Cubit_Server.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
index 68ce2b6165b..8f899ff99cc 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Cubit
{
// = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index 5d753a50db8..5ba42c3f4db 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-all.h"
#if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 7e0045bf9aa..6e0750d7838 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Sched_Params.h"
#include "Globals.h"
#include "Cubit_Task.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 3ce978c9347..9d918022ac4 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Globals.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index a2524f3d52e..ef5f612754f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, strategies {
IDL_Files {
cubit.idl
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 83217ea1f52..10da30b572c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Task_Client.h"
#include "Timer.h"
#include "ace/Stats.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index 948dc4af38d..f7e1ae4fc4c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Util_Thread.h"
#include "ace/ACE.h"
#include "ace/Barrier.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 822032d3714..3438baa7d6c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/config-all.h"
#if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
index 30285cd9d12..da68193d934 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Cubit
{
// = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 63973fd7c1a..1359acd6f0b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Constants.h"
#include "cubit_i.h"
#include "Task_Client.h"
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 939cd18912a..076acb3192a 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*AMH_latency_idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 36a200cdcf4..cbcd21bd8dc 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc
index 41a969e0147..2db781d2f8d 100644
--- a/TAO/performance-tests/Latency/AMI/AMI.mpc
+++ b/TAO/performance-tests/Latency/AMI/AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index c7beb0469ea..1c5482c6a3f 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ROUNDTRIP_HANDLER_H
#define ROUNDTRIP_HANDLER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index faf45ee0574..b7223db09cd 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip_Handler.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index e5cebc42463..def5bed8ae5 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
index b9f851bf3c2..a8475f27526 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc
+++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(Latency*): taoserver, strategies {
exename = Collocated_Test
avoids += ace_for_tao
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 77c1483e4a8..3215b3a7c65 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index e6fd45fd08b..2273992983e 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 1515c4af7bd..a6260e73162 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index ec4320644e4..c71229731e0 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index db1e0e0b512..71b0808a4fd 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index e71e4ec9178..4f54f7a0872 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index 45db13bf079..caefd2ff1a6 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h" /* This must come first for
G++ 3.4 or better */
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index 699b18e36ac..731640bf22c 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index 36a200cdcf4..cbcd21bd8dc 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 75716ac14b5..07a0fbaf7b1 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index 15f41e7c886..1cabec72e79 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 7a3ddeacbc4..8d28b314596 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 75716ac14b5..07a0fbaf7b1 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
index 56499861212..791a398e31d 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*latency_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index 7a3ddeacbc4..8d28b314596 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 2803f597e72..cd5e70115aa 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "Worker_Thread.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp b/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
index 9238769bd96..41d13f81555 100644
--- a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
#include "Foo_i.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index d76ea2610fc..4c2f7924601 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MEMORY_GROWTH_H
#define MEMORY_GROWTH_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
index 0fe46138f86..5f8986916a5 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
+++ b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idl_files {
Test.idl
diff --git a/TAO/performance-tests/Memory/IORsize/Test.idl b/TAO/performance-tests/Memory/IORsize/Test.idl
index 7b4128b8c20..d5472cffc30 100644
--- a/TAO/performance-tests/Memory/IORsize/Test.idl
+++ b/TAO/performance-tests/Memory/IORsize/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp
index 18eb21c4713..2f097812309 100644
--- a/TAO/performance-tests/Memory/IORsize/client.cpp
+++ b/TAO/performance-tests/Memory/IORsize/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "TestS.h"
diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp
index c552df3c9cc..e9d9f3fb751 100644
--- a/TAO/performance-tests/Memory/IORsize/server.cpp
+++ b/TAO/performance-tests/Memory/IORsize/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Memory_Growth.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index 2acd1ce5e05..77dc292a0cf 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
index e0c71de9da9..c6d5c2e11f7 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
index c552df3c9cc..e9d9f3fb751 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Memory_Growth.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index 0fa233bb2d0..d9048670f2e 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_corba_e_micro, avoids_ace_for_tao {
exename = create_reference
}
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index cc9afe79088..174255b5bf5 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer.h"
#include "tao/ORB_Constants.h"
#include "tao/ORB.h"
diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc
index 4370ff2f9d5..32bb6f4ae03 100644
--- a/TAO/performance-tests/POA/Demux/Demux.mpc
+++ b/TAO/performance-tests/POA/Demux/Demux.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*poa idl): taoidldefaults {
IDL_Files {
demux_test.idl
diff --git a/TAO/performance-tests/POA/Demux/demux_test.idl b/TAO/performance-tests/POA/Demux/demux_test.idl
index 104bd97091c..00cf3acd60d 100644
--- a/TAO/performance-tests/POA/Demux/demux_test.idl
+++ b/TAO/performance-tests/POA/Demux/demux_test.idl
@@ -1,4 +1,3 @@
-// $Id$
// Interface for TAO's Demux_Test
interface Demux_Test
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index 7e6e57c1719..abc0809c065 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sa -St
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index ede6a1374df..526edd50312 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index d00dbd20d2f..8aa76f08e8c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9884ddb93ee..1d9054487c8 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Factory.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index ac39fcfb8c9..fe3f20c3ca4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(registration): taoexe, portableserver, avoids_corba_e_micro, avoids_ace_for_tao {
exename = registration
}
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl b/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
index 329acf8055e..907847b2cfd 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// Simple interface to be used in registration test
//
diff --git a/TAO/performance-tests/Pluggable/PP_Test.idl b/TAO/performance-tests/Pluggable/PP_Test.idl
index ed5301c4781..9e6a9670fe6 100644
--- a/TAO/performance-tests/Pluggable/PP_Test.idl
+++ b/TAO/performance-tests/Pluggable/PP_Test.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface Pluggable_Test
{
// = TITLE
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index ce968f029a4..4cf2427b933 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PP_Test_Client.h"
#include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index e6dc2fff394..a8121b86a85 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PP_Test_Server.h"
#include "tao/TAO_Internal.h"
#include "tao/debug.h"
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index 75e85bf24df..41851894879 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
PP_Test.idl
diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp
index 1eb80035a87..2ac9b960752 100644
--- a/TAO/performance-tests/Pluggable/client.cpp
+++ b/TAO/performance-tests/Pluggable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PP_Test_Client.h"
#include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index ecb07808724..97ad684db6c 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PP_Test_Server.h"
#include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 826cccec1c8..291329870c3 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 1e3d712d65f..362bfdf6e90 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 6b1c2f62d57..efbb376b2f1 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 597b0ea4992..e10826b6e00 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
#include "ace/Stats.h"
diff --git a/TAO/performance-tests/Protocols/test.idl b/TAO/performance-tests/Protocols/test.idl
index 33f1a21606a..2cb62463d00 100644
--- a/TAO/performance-tests/Protocols/test.idl
+++ b/TAO/performance-tests/Protocols/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void start_test (in long session_id,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 2373d00b9f0..4d8d483aa1d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = RTCORBA_Common
requires += rt_corba
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
index 6b4617d0fd5..4aeabdededc 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index 6f511ae008a..7c0770ae78a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/ACE.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
index 673f315b7ca..60fa6e3774b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Test_i::Test_i (void)
{
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
index 22fa8a8fce4..2c592b85af3 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): rt_server, strategies, rtcorbacommon, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 31243265912..3466ec9ced1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index e6556096ce5..cbca89d0e78 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
index 56b1686697e..d350191b43f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): rt_server, strategies, rtcorbacommon {
Source_Files {
server.cpp
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index c801d22963b..3f499bffaba 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "../Common/testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index cbe061ebdb9..167267759b2 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index f9c59018da4..6be3210def2 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*oneways idl RT): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index a4ab2ea9e38..01fcc474949 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index 944c06db6ce..4e8f517450b 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 8abc4a2c00b..04cf24da8fa 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/ACE.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
index c918e290e88..716cacf1fc2 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Test_i::Test_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 913c80c0739..575beb6ac98 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*RTCorba idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index ba3e578c082..9e835b90b7f 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
#include "ace/Stats.h"
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index a4e9993fec6..8cfdad88d30 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Stats.h"
#include "ace/Task.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 7fdc182014e..681c81d6e7f 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*AMH_sequence_idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index d7ce746d9b8..7af03422198 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 72c3514b46b..1689bf80ef4 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ROUNDTRIP_HANDLER_H
#define ROUNDTRIP_HANDLER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
index d9fde7e7816..d84bbaf9738 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index c2f8d609108..7cfef21bc2b 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip_Handler.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
index e5cebc42463..def5bed8ae5 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index d4f879d4a6f..8bc79752b6b 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index c0b3bc94790..8498b310c13 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 97120f54c39..1ada685ed08 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
index db1e0e0b512..71b0808a4fd 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 54def5f5f87..c97c4981f9e 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index e67705b13e9..098776142d6 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h" /* Must come first for G++
3.4 or better */
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
index 38c4e767850..e7cf9c72194 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
sequence.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
index 671fd4f3cf6..84d8f2d37ee 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/StringSeq.pidl"
struct Str_Sequences
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index bf4db3004ca..1163c7866f3 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -1,6 +1,4 @@
// Test of raw copy performance when using different sequence allocations
-// $Id$
-
#include "sequenceC.h"
#include "ace/Time_Value.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index fae260ec562..64bd4650ff6 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index 6c6829f2bae..2b48adf7df4 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index d8bce48960e..efacd2f57e0 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index c959ae45aa3..79f1c7eb6e3 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
index 9e690719c57..fd7d234162a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index 5a67e410966..efe0b8651db 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index c959ae45aa3..79f1c7eb6e3 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENT_TASK_H
#define CLIENT_TASK_H
#include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
index 433de27a1d4..374135b7614 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*sequence_idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index 4224adf3218..29a4c32a8a0 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 5bdc4b137a3..8107554e861 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "Worker_Thread.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index e0baa06c094..1ef2954e936 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 02c342abf9d..a1e54de8a44 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/High_Res_Timer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 6bf0fccfa31..48697e5e52a 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_Factory.h"
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index a4261f4c985..a1605345254 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Abstract_Servant_Base.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tao/Abstract_Servant_Base.inl b/TAO/tao/Abstract_Servant_Base.inl
index e879919a9d7..022fac0a234 100644
--- a/TAO/tao/Abstract_Servant_Base.inl
+++ b/TAO/tao/Abstract_Servant_Base.inl
@@ -1,5 +1,3 @@
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp
index ac35c2e3981..26a7f1d33d9 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Acceptor_Filter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 00ca24efe34..9adc59e4f45 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Acceptor_Registry.h"
#include "tao/Profile.h"
#include "tao/Transport_Acceptor.h"
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 2457a4ac145..b77750e0b27 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp
index 104a5662569..20a5f497a1a 100644
--- a/TAO/tao/Adapter_Factory.cpp
+++ b/TAO/tao/Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Adapter_Factory.h"
// ****************************************************************
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index cd334c5326b..e6c04ff658d 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Object.h"
#include "tao/Stub.h"
#include "tao/Adapter_Registry.h"
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index 4022a2dab9d..985b98a2f5e 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ALIAS_TYPECODE_CPP
#define TAO_ALIAS_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index cb2787562b7..f98a6fa3546 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 1505b5444e9..13619326827 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Any.h"
#include "tao/AnyTypeCode/Any_Basic_Impl.h"
#include "tao/AnyTypeCode/Any_Impl_T.h"
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index 7dbf88c5b16..cb8beef4ed0 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/SystemExceptionA.h"
#include "tao/AnyTypeCode/WrongTransactionA.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 025e7008629..8c7c723a562 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ANY_ARRAY_IMPL_T_CPP
#define TAO_ANY_ARRAY_IMPL_T_CPP
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index d0f95000579..1aedfbc1951 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Any_Basic_Impl.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index a475480d605..0a38d944318 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ANY_BASIC_IMPL_T_CPP
#define TAO_ANY_BASIC_IMPL_T_CPP
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 66206f5c18b..eb3b9fdfc4b 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ANY_DUAL_IMPL_T_CPP
#define TAO_ANY_DUAL_IMPL_T_CPP
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index b65943a7333..4655db276f9 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Any_Impl.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Marshal.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index 2d5f97c515c..c1872c61e3f 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ANY_IMPL_T_CPP
#define TAO_ANY_IMPL_T_CPP
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index b7e0966eb72..e0055e0cb2f 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ANY_SPECIAL_IMPL_T_CPP
#define TAO_ANY_SPECIAL_IMPL_T_CPP
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index c9c26ef2e19..1e553d02c08 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Any_SystemException.h"
#include "tao/AnyTypeCode/Any.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 23932fb77b5..72e818c8ca7 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "tao/AnyTypeCode/Marshal.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 649ec18e4c5..1cf8645c5a2 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index a3aec8afcd7..2297a263a00 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ENUM_TYPECODE_CPP
#define TAO_ENUM_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 2c7480958c9..5ef55878740 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
#include "tao/AnyTypeCode/TypeCode_Traits.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index 36308a3c71f..301d70b5f49 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/ExceptionA.h"
#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index 54f67e17f9c..c637b062579 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_TYPECODE_CPP
#define TAO_FIXED_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
index 80e75921094..ec34f735087 100644
--- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CDR.h"
#include "tao/AnyTypeCode/Indirected_Type_TypeCode.h"
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index f48425693a4..fba13992a3b 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implementation of Named Value List and NamedValue classes
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 7b598020a9a..d170907e390 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/NVList_Adapter_Impl.h"
#include "tao/AnyTypeCode/NVList.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index d38ad4e2cbd..bf7cedff22d 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OBJREF_TYPECODE_CPP
#define TAO_OBJREF_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 87b3398b374..2502e71169d 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index dd3ea5a7832..fee15f7cf17 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CDR.h"
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
index f8ec3c9d343..ba62129030b 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SEQUENCE_TYPECODE_CPP
#define TAO_SEQUENCE_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index 26f13c58fa0..a1816134fa7 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
#include "tao/CDR.h"
#include "tao/AnyTypeCode/TypeCode_Traits.h"
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
index ff497b2df01..b1424e84b7d 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_STRING_TYPECODE_CPP
#define TAO_STRING_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index aebe8ea7129..90b9344e529 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/String_TypeCode_Static.h"
#include "tao/CDR.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index 0cfdad22a48..0e1bbf380e0 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_STRUCT_TYPECODE_CPP
#define TAO_STRUCT_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index c9076fa66fb..3519d0904b0 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
#include "tao/AnyTypeCode/TypeCode_Traits.h"
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
index bbb59777472..43b786c0d7c 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/SystemExceptionA.h"
#include "tao/AnyTypeCode/Any_SystemException.h"
#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
diff --git a/TAO/tao/AnyTypeCode/TAO_AnyTypeCode_Export.h b/TAO/tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
index 4767016fbcc..3d4600fada3 100644
--- a/TAO/tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+++ b/TAO/tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
index 3d96b379e56..3f25a04ed14 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/True_RefCount_Policy.h"
#ifndef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index 8733afe0e17..b8277a895cc 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/AnyTypeCode/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
index eed874a1f1d..e3ac11d2985 100644
--- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.cpp b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.cpp
index da416b4314f..445c6bbf6da 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_CPP
#define TAO_TYPECODE_BASE_ATTRIBUTES_CPP
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index bdbaf9d9ba2..b3d656e61cb 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h"
#include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index b7fa0471d41..32f411cb9e5 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TYPECODE_CASE_CPP
#define TAO_TYPECODE_CASE_CPP
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
index 98e82777b05..9b8f98173ee 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TYPECODE_CASE_ENUM_T_CPP
#define TAO_TYPECODE_CASE_ENUM_T_CPP
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index bf2ab77277b..86219d92c73 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TYPECODE_CASE_T_CPP
#define TAO_TYPECODE_CASE_T_CPP
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
index edbed74e78e..45f10d386e2 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode_Constants.h"
#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
#include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index 27c7eb6a8d1..0b0ec01c176 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_UNION_TYPECODE_CPP
#define TAO_UNION_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 6a2c7128cf7..0ee4b423050 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Union_TypeCode_Static.h"
#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 8155a50d06c..bc909c2e411 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VALUE_TYPECODE_CPP
#define TAO_VALUE_TYPECODE_CPP
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 50d4ccf6c68..e038c68f712 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
#include "tao/CDR.h"
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
index 96f855bed87..325f0fd6a1c 100644
--- a/TAO/tao/AnyTypeCode_Adapter.cpp
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index b82827f1d12..0125be2ffea 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Argument.h"
#include "ace/OS_Memory.h"
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp
index 23fcc598ff1..c898e7a09fd 100644
--- a/TAO/tao/Array_VarOut_T.cpp
+++ b/TAO/tao/Array_VarOut_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ARRAY_VAROUT_T_CPP
#define TAO_ARRAY_VAROUT_T_CPP
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index 5cc1e241108..268346a6ed2 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Asynch_Queued_Message.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
index 9e446e1c31b..e523eca591d 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Asynch_Reply_Dispatcher_Base.h"
#include "tao/Pluggable_Messaging_Utils.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index 2167ce1b403..391f89752a2 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BD_STRING_ARGUMENT_T_CPP
#define TAO_BD_STRING_ARGUMENT_T_CPP
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index 627d970c4a3..9f4b3058cd1 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BASIC_ARGUMENT_T_CPP
#define TAO_BASIC_ARGUMENT_T_CPP
diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp
index 4ad90e15473..c5e01c278f8 100644
--- a/TAO/tao/BiDir_Adapter.cpp
+++ b/TAO/tao/BiDir_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/BiDir_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 15b19c31940..bc2a9361b56 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index 71e17e7cb05..f6acc37e454 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
#include "tao/Policy_Set.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index db90d1ac6c5..51fcc54db14 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 18dc40e0995..76a18ff09f0 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index cd328dc8a56..6c023bc48c6 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
index 72671864f05..50c7eebee6e 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/BiDir_GIOP/BiDir_Service_Context_Handler.h"
#include "tao/CDR.h"
#include "tao/TAO_Server_Request.h"
diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp
index 8efa32be24d..7922d29f21c 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Bind_Dispatcher_Guard.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
index d6939825ffb..4ca3d7435dd 100644
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Block_Flushing_Strategy.h"
#include "tao/Transport.h"
#include "tao/Queued_Message.h"
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index 0807f9fd681..b55e0ff00c2 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Blocked_Connect_Strategy.h"
#include "tao/Connection_Handler.h"
diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
index 52ae87f3c33..cab52477446 100644
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ b/TAO/tao/Buffer_Allocator_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BUFFER_ALLOCATOR_T_CPP
#define TAO_BUFFER_ALLOCATOR_T_CPP
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index a543e541448..0f040b90f62 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CDR.h"
#include "tao/Timeprobe.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 81c310f28b7..932c0426273 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CORBALOC_Parser.h"
#if (TAO_HAS_CORBALOC_PARSER == 1)
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 54db4972bcf..0cdd89afda9 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#if (TAO_HAS_CORBANAME_PARSER == 1)
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index 803c86975f2..7e173e3480a 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBA_String.h"
#include "tao/String_Manager_T.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 797af515024..28bbada650c 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
#include "tao/CSD_Framework/CSD_POA.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Export.h b/TAO/tao/CSD_Framework/CSD_FW_Export.h
index edeb9119dc4..63e99d6ace2 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Export.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_CSD_FW
// ------------------------------
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 7d600b3d76b..6dfda150d7e 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 5f9e5e65791..7aabd46fdb9 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Framework_Loader.h"
#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
index 5b289d5819b..36bce1c32c6 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index 1daba9b08e5..79a36821536 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Object_Adapter.h"
#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
#include "tao/CSD_Framework/CSD_POA.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index 11ff051f409..973a03d0b66 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
#include "tao/CSD_Framework/CSD_Object_Adapter.h"
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index 9c6a0e0dda4..a77bb5f32e9 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_POA.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
#include "tao/CSD_Framework/CSD_Strategy_Base.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index 8c78d072105..c3e72d3ea57 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Strategy_Base.h"
#include "tao/CSD_Framework/CSD_POA.h"
#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
index 07de03d9b98..0fb2c3b456e 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
#include "tao/TAO_Server_Request.h"
#include "tao/debug.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
index fdb6b8834b4..556c4504762 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
#include "tao/debug.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
index 7ba5827077a..259cdff76a3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
index f057b02c081..58d9c18a4eb 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index f843aa38fec..7352a02eb3a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
index b9f006f86d4..737fd12e591 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h"
#include "tao/Exception.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
index 7c3642e1bf6..9942bab9284 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
index 0f1b8328510..a073fb6f102 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
index 6ae6061aef8..d20f8725fc6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
index fff0638958b..345090dba11 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
index c2e358de401..dc4c891fe5e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
index ca87f1893ad..222a63547c7 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h
index 1eeb556e4f8..485a8a738a5 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_CSD_TP
// ------------------------------
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
index 49603a489a6..d295f919aff 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Queue.h"
#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
index 8ef0a64ac09..61bae0dfc18 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
index 674e4441c52..2d9004d3f37 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
index 8613bfdac99..f65f202d6b6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
index f50e3d25773..6047035fc85 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
index 80c94043679..f4fdaf379b9 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 40d9d502535..84627c4375f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index 76f1fb18ec9..c2d08d1542a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h"
#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
index 12768d5db7c..188f09123fb 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
index 2f142716d5d..adf5c1b1bc3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Guard_T.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index c73f851478f..fad2e40c72d 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_TP_Task.h"
#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
index 120f88a3a73..304d2af1198 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h"
#include "tao/CSD_Framework/CSD_Framework_Loader.h"
diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp
index 2cd1a8021a6..e047a890c89 100644
--- a/TAO/tao/Cache_Entries_T.cpp
+++ b/TAO/tao/Cache_Entries_T.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
# include "tao/Cache_Entries_T.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp
index 714fc06be16..5597de7531d 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Cleanup_Func_Registry.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index 7fca1d44e7f..c5e425c4cd8 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ClientRequestInterceptor_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
index 4552cb8c328..7f0347296a5 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index b7df038bba5..9058c65b2d2 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Client_Strategy_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 453dd84f03a..a3ac4538d23 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CDR_Encaps_Codec.h"
#include "tao/CDR.h"
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index 657c2cdd985..70af066d3d2 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CodecFactory_impl.h"
#include "tao/CodecFactory/CDR_Encaps_Codec.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 5036fb2c936..45cce73fc69 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TAO_Server_Request.h"
#include "tao/operation_details.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Codeset/Codeset_Service_Context_Handler.cpp b/TAO/tao/Codeset/Codeset_Service_Context_Handler.cpp
index 74049b40c12..663da891eea 100644
--- a/TAO/tao/Codeset/Codeset_Service_Context_Handler.cpp
+++ b/TAO/tao/Codeset/Codeset_Service_Context_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Codeset/Codeset_Service_Context_Handler.h"
#include "tao/CDR.h"
diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
index 1751a364c5c..79a504fcb81 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// ============================================================================
// Manages the transformation between native and transmitted UTF-16. It is
// Required because transmitted UTF-16 may carry a byte order marker (BOM)
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
index 5e8a3ee1b09..825790771c4 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/debug.h"
#include "ace/Dynamic_Service.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
index 73ef2ff651b..4ccd8ff75b8 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef UTF8_LATIN1_FACTORY_H
#define UTF8_LATIN1_FACTORY_H
diff --git a/TAO/tao/Codeset/codeset_export.h b/TAO/tao/Codeset/codeset_export.h
index 0c7a2863484..fad8a95bac7 100644
--- a/TAO/tao/Codeset/codeset_export.h
+++ b/TAO/tao/Codeset/codeset_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index d7273597983..1fa161ab63a 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Codeset_Manager.h"
#include "tao/Codeset_Descriptor_Base.h"
diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp
index 1e5c29e5fc7..a77dfd61797 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/Codeset_Manager.h"
#include "tao/Codeset_Manager_Factory_Base.h"
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 0b338b2d60a..e4b01c4a882 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Collocated_Invocation.h"
#include "tao/ORB_Core.h"
#include "tao/Request_Dispatcher.h"
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index e799cd12f20..2ddca927e09 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Collocation_Resolver.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp
index b0ac64317ef..92abdd8937d 100644
--- a/TAO/tao/Compression/Base_Compressor.cpp
+++ b/TAO/tao/Compression/Base_Compressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/Base_Compressor.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index d98a497c93f..66a31fa1162 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/Compression.h"
#include "tao/Compression/Compression_Manager.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index e3d14b91214..7fb3e396249 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/Compression_Manager.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index c55434f675f..dfbb8166fc2 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/Compressor_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
index 91d7b34defd..f12f2ee4216 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Bzip2Compressor.h"
#include "bzlib.h"
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
index d27d57231b6..34a1947c942 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/bzip2/Bzip2Compressor_Factory.h"
#include "tao/Compression/bzip2/Bzip2Compressor.h"
diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_export.h b/TAO/tao/Compression/bzip2/Bzip2Compressor_export.h
index 258daeea878..45690a4c2fc 100644
--- a/TAO/tao/Compression/bzip2/Bzip2Compressor_export.h
+++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Compression/compression_export.h b/TAO/tao/Compression/compression_export.h
index fe32df0cecb..d6020f82225 100644
--- a/TAO/tao/Compression/compression_export.h
+++ b/TAO/tao/Compression/compression_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Compression/lzo/LzoCompressor.cpp b/TAO/tao/Compression/lzo/LzoCompressor.cpp
index 4d714773b68..70b9457bff3 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor.cpp
+++ b/TAO/tao/Compression/lzo/LzoCompressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LzoCompressor.h"
#include <lzo1x.h>
#include <lzoutil.h>
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
index bee3762ed3e..ca73864c783 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
+++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/lzo/LzoCompressor_Factory.h"
#include "tao/Compression/lzo/LzoCompressor.h"
#include <lzo1x.h>
diff --git a/TAO/tao/Compression/lzo/LzoCompressor_export.h b/TAO/tao/Compression/lzo/LzoCompressor_export.h
index dd8404ca9a7..e8e6e23c512 100644
--- a/TAO/tao/Compression/lzo/LzoCompressor_export.h
+++ b/TAO/tao/Compression/lzo/LzoCompressor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Compression/rle/RLECompressor.cpp b/TAO/tao/Compression/rle/RLECompressor.cpp
index a77a121f429..81ad5367df7 100644
--- a/TAO/tao/Compression/rle/RLECompressor.cpp
+++ b/TAO/tao/Compression/rle/RLECompressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
* Run-length encoding (RLE) is a very simple form of data compression
* in which runs of data (that is, sequences in which the same data value
diff --git a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
index 7ca12ad6e73..bc07307d25c 100644
--- a/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
+++ b/TAO/tao/Compression/rle/RLECompressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/rle/RLECompressor_Factory.h"
#include "tao/Compression/rle/RLECompressor.h"
diff --git a/TAO/tao/Compression/rle/RLECompressor_export.h b/TAO/tao/Compression/rle/RLECompressor_export.h
index 41e2926cd13..1f39e3dce47 100644
--- a/TAO/tao/Compression/rle/RLECompressor_export.h
+++ b/TAO/tao/Compression/rle/RLECompressor_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_RLECOMPRESSOR
// ------------------------------
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
index dc35e9992c4..8145ac06a61 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ZlibCompressor.h"
#include "zlib.h"
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index b7e5fd8e205..c687786d48b 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Compression/zlib/ZlibCompressor_Factory.h"
#include "tao/Compression/zlib/ZlibCompressor.h"
#include "ace/Min_Max.h"
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_export.h b/TAO/tao/Compression/zlib/ZlibCompressor_export.h
index 9c3e8a8cd50..34ddecb2f12 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_export.h
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp
index 738018c977d..0197963070c 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_CONDITION_CPP
#define TAO_CONDITION_CPP
#include "tao/Condition.h"
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index bae863c9491..1410e5f1fcd 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Connect_Strategy.h"
#include "tao/Transport.h"
#include "tao/Connection_Handler.h"
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 31374a9cf91..f2da6b6f89b 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Connection_Handler.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
index 239c7a0352d..b6eface5905 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Connection_Purging_Strategy.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp
index ffb5ee30b89..c44c9a988ab 100644
--- a/TAO/tao/Connector_Impl.cpp
+++ b/TAO/tao/Connector_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_CONNECTOR_IMPL_CPP
#define TAO_CONNECTOR_IMPL_CPP
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 66ec952cf7a..0f828f613b1 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Connector_Registry.h"
#include "tao/ORB_Core.h"
#include "tao/Profile.h"
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 963534d0ebc..7666e20d18e 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DLL_Parser.h"
# if (TAO_HAS_DDL_PARSER == 1)
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index 552d1ebf253..7e1382e4947 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Default_Collocation_Resolver.h"
#include "tao/Object.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index bccea7d9b21..a0f5c95d070 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Default_Endpoint_Selector_Factory.h"
#include "tao/Invocation_Endpoint_Selectors.h"
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 4462a35b97c..ee2fa4090c8 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Default_Stub_Factory.h"
#include "tao/Stub.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index ffb100c5fa6..2715e7a9a63 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Default_Thread_Lane_Resources_Manager.h"
#include "tao/Thread_Lane_Resources.h"
#include "tao/Exception.h"
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 8e5e61262b1..dc67ef4224b 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
#include "tao/ORB_Constants.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
index 86ab39e17f5..647f0dbfdef 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DiffServPolicy/DiffServPolicy.h"
#include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
#include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h
index 2c6f69d9411..2adc40a0826 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_DiffServPolicy
// ------------------------------
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
index d0e31f1ad7f..e02ea245536 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
index edbbb3f4c59..3080cb11b56 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h"
#include "tao/DiffServPolicy/DiffServPolicy.h"
#include "tao/DiffServPolicy/DiffServPolicy_Factory.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
index fa4fd7a8f73..654df95ab73 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/POA_Policy_Set.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
index 4a6af6e6261..93ac25c2918 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DiffServPolicy/DiffServ_Protocols_Hooks.h"
#include "tao/Stub.h"
#include "tao/Profile.h"
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
index bc8f86164df..dff79249f78 100644
--- a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DiffServPolicy/DiffServ_Service_Context_Handler.h"
#include "tao/DiffServPolicy/Client_Network_Priority_Policy.h"
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index d496ec141cc..33500fa2b47 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DiffServPolicy/Server_Network_Priority_Policy.h"
#include "tao/SystemException.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index a7c8dbe5ee0..6dc465ff12c 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 2e060b4614d..c70f37b1763 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynArray_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "tao/DynamicAny/DynAnyUtils_T.h"
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index f03f5cfcb8e..34f75677938 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//=============================================================================
/**
* @file DynArray_i.h
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 6c6487f36d0..945064eecb9 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "tao/Valuetype/AbstractBase.h"
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 3df1b8365ad..bb5529b24b6 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index abc638cfd42..e5ea2d54784 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//=============================================================================
/**
* @file DynEnum_i.h
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 9383ae59ac0..702fb10a131 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynSequence_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "tao/DynamicAny/DynAnyUtils_T.h"
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index cd8b8daa053..bd366d20ad2 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynStruct_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "tao/DynamicAny/DynAnyUtils_T.h"
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 9f5ced312f4..92007447d85 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynUnion_i.h"
#include "tao/DynamicAny/DynEnum_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index e083f67eba5..4f6976e784e 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynValueBox_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "tao/DynamicAny/DynAnyUtils_T.h"
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index 252e553071f..08400a45e9a 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynValueCommon_i.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 8c1ed23e121..6892ea759dc 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicAny/DynValue_i.h"
#include "tao/DynamicAny/DynAnyFactory.h"
#include "tao/DynamicAny/DynAnyUtils_T.h"
diff --git a/TAO/tao/DynamicAny/dynamicany_export.h b/TAO/tao/DynamicAny/dynamicany_export.h
index 83eed065565..7abb33b6878 100644
--- a/TAO/tao/DynamicAny/dynamicany_export.h
+++ b/TAO/tao/DynamicAny/dynamicany_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 03091f7919c..ebdabe25ceb 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMH_DSI_Response_Handler.h"
#include "Request.h"
#include "ExceptionList.h"
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
index 64f17efaeda..e322c651073 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 380b77a0e7a..01cb4234dbb 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Context.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 6f955615445..d95e1c7ab1b 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/DII_Arguments.h"
#include "tao/AnyTypeCode/NVList.h"
#include "tao/AnyTypeCode/Any_Impl.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index 02a21c15a15..f8aaa486cc0 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h"
#include "tao/DynamicInterface/DII_Arguments.h"
#include "tao/AnyTypeCode/NVList.h"
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 8cb79e7561f..718e97f4cf9 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index 9225703f6d9..f83d406f36c 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/debug.h"
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
index a80282e520f..364dbad4979 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Request.h"
#include "ExceptionList.h"
#include "DII_Invocation.h"
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
index cfc16dc9b36..9cba5d062f3 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_DII_Reply_Handler_ptr
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 654b3caf287..a63b6f5264e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 1da6a6dd03f..f61b145bf7a 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicInterface/Dynamic_Implementation.h"
#include "tao/DynamicInterface/Server_Request.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index a594cf34feb..5fb4d67b4a0 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/ExceptionList.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index fb284a82705..1b6f8fff951 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
#include "tao/DynamicInterface/DII_Arguments.h"
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 7bcc213d24d..e3208290942 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implementation of the Dynamic Server Skeleton Interface.
#include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 40baeaaed0c..b1d38216ad1 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Unknown_User_Exception.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tao/DynamicInterface/dynamicinterface_export.h b/TAO/tao/DynamicInterface/dynamicinterface_export.h
index f1e680434fc..cdb820b8f9f 100644
--- a/TAO/tao/DynamicInterface/dynamicinterface_export.h
+++ b/TAO/tao/DynamicInterface/dynamicinterface_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by
// generate_export_file.pl
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index d032903f040..76a6e2bb58d 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp
index 09cbd9eefaa..ddde096cb16 100644
--- a/TAO/tao/Dynamic_TP/DTP_Config.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Config.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
index fc8e97f187f..63273b603f7 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_ORBInitializer.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
index ae4794722eb..06f5b83a5b5 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_ORB_Loader.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
index c363e8f7553..96d7391e483 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_POA_Loader.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
index ee83ed4e645..7b3e920b8ca 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp
index e5147ed4478..1d5a6d03f1f 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Task.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
index 1b70111c86b..636c345d7da 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
index 8a2690f721f..d9dfb449d96 100644
--- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Thread_Pool.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/Dynamic_TP/dynamic_tp_export.h b/TAO/tao/Dynamic_TP/dynamic_tp_export.h
index 3c6fd2ff524..7ab47cb3c6a 100644
--- a/TAO/tao/Dynamic_TP/dynamic_tp_export.h
+++ b/TAO/tao/Dynamic_TP/dynamic_tp_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Dynamic_TP
// ------------------------------
diff --git a/TAO/tao/ETCL/TAO_ETCL.mpc b/TAO/tao/ETCL/TAO_ETCL.mpc
index 754ab124bee..ea7d8237c39 100644
--- a/TAO/tao/ETCL/TAO_ETCL.mpc
+++ b/TAO/tao/ETCL/TAO_ETCL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_ETCL) : anytypecode, ace_etcl, install, tao_output {
sharedname = TAO_ETCL
dynamicflags += TAO_ETCL_BUILD_DLL
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
index 46feb6fbe6c..1dd94ee7058 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/ETCL/ETCL_Constraint_Visitor.h"
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
index a04a04fd7bb..f12a2537209 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// ****************************************************************
ACE_INLINE
diff --git a/TAO/tao/ETCL/tao_etcl_export.h b/TAO/tao/ETCL/tao_etcl_export.h
index 5f78b57d789..ecf0f6fba32 100644
--- a/TAO/tao/ETCL/tao_etcl_export.h
+++ b/TAO/tao/ETCL/tao_etcl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index 0cb19d5ebaa..7142c6ab8fe 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Endpoint.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index c805449278d..8084ab4a572 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/EndpointPolicy/EndpointPolicy.h"
#include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h
index d9940484cfe..27767743e6d 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_EndpointPolicy
// ------------------------------
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index 2f9a9003500..e6014a3a563 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
#include "tao/EndpointPolicy/EndpointPolicy_i.h"
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index 3f77a792301..de998940338 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
#include "tao/EndpointPolicy/EndpointPolicyC.h"
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index ee5b1837fc5..079baa48b27 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/EndpointPolicy/EndpointPolicy_i.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
index ce7a2bbe0af..50a2239c1db 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
#include "tao/EndpointPolicy/EndpointPolicyC.h"
#include "tao/EndpointPolicy/Endpoint_Value_Impl.h"
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
index 12d8ddf9a20..197b7e26192 100644
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
#include "tao/PortableServer/Default_Acceptor_Filter.h"
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
index df661b189a8..ac2bde0fef2 100644
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp
index 3b0f2bdb3d8..7078166b809 100644
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Endpoint_Selector_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 4446f7348f1..5f4cb9a9d53 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Environment.h"
#include "tao/ORB_Core.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 54606cc1fde..b6de9c41fce 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Exception.h"
#include "tao/SystemException.h"
#include "tao/Environment.h"
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index 69a4193caa3..f7f82391dad 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Exclusive_TMS.h"
#include "tao/Reply_Dispatcher.h"
#include "tao/debug.h"
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index f0cfad69d50..0c9398e27c9 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/FILE_Parser.h"
#if (TAO_HAS_FILE_PARSER == 1)
diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp
index a6db441e026..cee4f82a00a 100644
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ b/TAO/tao/Fault_Tolerance_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Fault_Tolerance_Service.h"
#include "tao/Services_Activate.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 31b500ff20d..1cb49937aaf 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_CPP
#define TAO_FIXED_ARRAY_ARGUMENT_T_CPP
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 04923dc6fa0..85c9537cb1b 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_SIZE_ARGUMENT_T_CPP
#define TAO_FIXED_SIZE_ARGUMENT_T_CPP
diff --git a/TAO/tao/FlResource/FlResource.mpc b/TAO/tao/FlResource/FlResource.mpc
index 28b64311268..e9a6860c0c1 100644
--- a/TAO/tao/FlResource/FlResource.mpc
+++ b/TAO/tao/FlResource/FlResource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
project(TAO_FlResource) : acelib, taolib, install, tao_output, taodefaults, ace_flreactor, taoidldefaults {
sharedname = TAO_FlResource
dynamicflags += TAO_FLRESOURCE_BUILD_DLL
diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp
index c38ea31aff2..eb7f16811ec 100644
--- a/TAO/tao/FlResource/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource/FlResource_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/FlResource/FlResource_Factory.h"
#include "tao/debug.h"
#include "ace/FlReactor/FlReactor.h"
diff --git a/TAO/tao/FlResource/FlResource_Loader.cpp b/TAO/tao/FlResource/FlResource_Loader.cpp
index 5bd6a04bfdd..83a1fbfab7f 100644
--- a/TAO/tao/FlResource/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource/FlResource_Loader.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/FlResource/FlResource_Loader.h"
#include "tao/ORB_Core.h"
#include "tao/FlResource/FlResource_Factory.h"
diff --git a/TAO/tao/FlResource/TAO_FlResource_Export.h b/TAO/tao/FlResource/TAO_FlResource_Export.h
index e63890b54a6..8ea5cbb75ce 100644
--- a/TAO/tao/FlResource/TAO_FlResource_Export.h
+++ b/TAO/tao/FlResource/TAO_FlResource_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_FlResource
// ------------------------------
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
index d6d754daf62..c14d50a30a5 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Flushing_Strategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FoxResource/FoxResource.mpc b/TAO/tao/FoxResource/FoxResource.mpc
index 7c520646455..7f1178b642f 100644
--- a/TAO/tao/FoxResource/FoxResource.mpc
+++ b/TAO/tao/FoxResource/FoxResource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
project(TAO_FoxResource) : acelib, taolib, install, tao_output, taodefaults, ace_foxreactor, taoidldefaults {
sharedname = TAO_FoxResource
dynamicflags += TAO_FOCRESOURCE_BUILD_DLL
diff --git a/TAO/tao/FoxResource/TAO_FoxResource_Export.h b/TAO/tao/FoxResource/TAO_FoxResource_Export.h
index dc8ce7b0db6..c2c76e37d28 100644
--- a/TAO/tao/FoxResource/TAO_FoxResource_Export.h
+++ b/TAO/tao/FoxResource/TAO_FoxResource_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_FoxResource
// ------------------------------
diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.cpp b/TAO/tao/GIOP_Fragmentation_Strategy.cpp
index d10348117a6..169aecfcba5 100644
--- a/TAO/tao/GIOP_Fragmentation_Strategy.cpp
+++ b/TAO/tao/GIOP_Fragmentation_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/GIOP_Fragmentation_Strategy.h"
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 46b4323c268..4b3a5c5fdb4 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/GIOP_Message_Base.h"
#include "tao/operation_details.h"
#include "tao/debug.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index a88e711e1f4..bf339a05610 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/GIOP_Message_Generator_Parser.h"
#include "tao/Pluggable_Messaging_Utils.h"
#include "tao/GIOP_Utils.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 3075e1a72e1..e9a6ca9f4bc 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/GIOP_Message_Generator_Parser_10.h"
#include "tao/GIOP_Utils.h"
#include "tao/GIOP_Message_Locate_Header.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
index 1d5e742d0e3..9dcc9dfe78d 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/GIOP_Message_Generator_Parser_11.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 30013e41745..9b0c1a683cf 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/GIOP_Message_Generator_Parser_12.h"
#include "tao/GIOPC.h"
#include "tao/GIOP_Utils.h"
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
index 10e59dcc1e3..e267668e10b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/GIOP_Message_Generator_Parser_Impl.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 8d9134310b9..c4888cdaca1 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/GIOP_Message_State.h"
#include "tao/debug.h"
#include "tao/GIOP_Message_Base.h"
diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp
index 96de7723086..b13f9eb1943 100644
--- a/TAO/tao/GIOP_Message_Version.cpp
+++ b/TAO/tao/GIOP_Message_Version.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
# include "tao/GIOP_Message_Version.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/HR_Time_Policy_Strategy.cpp b/TAO/tao/HR_Time_Policy_Strategy.cpp
index 09c39930da8..33cd3180412 100644
--- a/TAO/tao/HR_Time_Policy_Strategy.cpp
+++ b/TAO/tao/HR_Time_Policy_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/HR_Time_Policy_Strategy.h"
#include "ace/Timer_Heap_T.h"
diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp
index 7fee51b1146..bdf6b371d52 100644
--- a/TAO/tao/HTTP_Client.cpp
+++ b/TAO/tao/HTTP_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/HTTP_Client.h"
#if (TAO_HAS_HTTP_PARSER == 1)
diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
index 7326bccad4c..8468a6d9ddf 100644
--- a/TAO/tao/HTTP_Handler.cpp
+++ b/TAO/tao/HTTP_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/HTTP_Handler.h"
#if (TAO_HAS_HTTP_PARSER == 1)
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 0b708c22cac..7090dea4d03 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/HTTP_Parser.h"
#if (TAO_HAS_HTTP_PARSER == 1)
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index f2dfda37cdb..38082de9354 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 400aa68fe42..f7f1a0ff354 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IFR_Client_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index a915cf09dd9..2a06ca8ccab 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
* Hook to copy all include and forward declarations.
*/
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 8df96135dee..b282597af12 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IIOP_Connection_Handler.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 02f3601083e..890a1ba5cdf 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IIOP_Connector.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 6fafa5711c6..d2d0d1b3479 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
/*
* Add all include files within the following
* two markers.
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index feb5fb3f5f6..98ac45043b1 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IIOP_Factory.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 3795a767fe6..c4f0505a693 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IIOP_Profile.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 4620e8bc735..9e9318f8489 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IIOP_Transport.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index 74d02b94d9f..938b6fe61fa 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORInterceptor/IORInfo.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index f025537ce6d..3264348c172 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h"
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index b89d50abaea..29a1cf83dc8 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
#include "tao/IORInterceptor/IORInfo.h"
#include "tao/debug.h"
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
index d801908f3b8..2753cfe53a6 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORInterceptor/IORInterceptor_Details.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/IORInterceptor/iorinterceptor_export.h b/TAO/tao/IORInterceptor/iorinterceptor_export.h
index 4c6180c412a..5a4d224a57c 100644
--- a/TAO/tao/IORInterceptor/iorinterceptor_export.h
+++ b/TAO/tao/IORInterceptor/iorinterceptor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
index 5cb74c50eef..c4b785595ab 100644
--- a/TAO/tao/IORInterceptor_Adapter.cpp
+++ b/TAO/tao/IORInterceptor_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORInterceptor_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
index ccbcaea3879..4a1b09b31b3 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/IORInterceptor_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORManipulation/IORManip_Filter.cpp b/TAO/tao/IORManipulation/IORManip_Filter.cpp
index 2200f1b154c..eb2539bc8f9 100644
--- a/TAO/tao/IORManipulation/IORManip_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORManipulation/IORManip_Filter.h"
#include "tao/IORManipulation/IORManip_Loader.h"
#include "tao/MProfile.h"
diff --git a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
index 9e4b657417c..15c865ed9ef 100644
--- a/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
+++ b/TAO/tao/IORManipulation/IORManip_IIOP_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORManipulation/IORManip_IIOP_Filter.h"
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 755787f13ce..11fd191b7b6 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORManipulation/IORManip_Loader.h"
#include "tao/IORManipulation/IORManipulation.h"
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index cbeb0e36bec..89b7adc02c4 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORManipulation/IORManipulation.h"
#include "tao/MProfile.h"
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl
index ea0497f7d37..ad103ae89bf 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.inl
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr
diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp
index 931f6ec6064..7049b1b6ff0 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IOR_Parser.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index f1749479c86..dd99a93505c 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ImR_Client/ImR_Client.h"
#include "ace/Vector_T.h"
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index 08fe8da3515..19a07caf630 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ImR_Client/ServerObject_i.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/orbconf.h"
diff --git a/TAO/tao/ImR_Client/imr_client_export.h b/TAO/tao/ImR_Client/imr_client_export.h
index be4ed299190..13b784ae1b4 100644
--- a/TAO/tao/ImR_Client/imr_client_export.h
+++ b/TAO/tao/ImR_Client/imr_client_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index d1eaeedaaae..4b9048426ec 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Incoming_Message_Queue.h"
#include "tao/Queued_Data.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Incoming_Message_Stack.cpp b/TAO/tao/Incoming_Message_Stack.cpp
index 9e50caeb7ea..130762ca807 100644
--- a/TAO/tao/Incoming_Message_Stack.cpp
+++ b/TAO/tao/Incoming_Message_Stack.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
# include "tao/Incoming_Message_Stack.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp
index 2e25bad2b53..b9404e42f3c 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP
#define TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp
index 5c8d02b76ba..292aadfd0cb 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP
#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP
diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.cpp b/TAO/tao/Intrusive_Ref_Count_Object_T.cpp
index d5789743340..ad25cafa9f4 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.cpp
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_INTRUSIVE_REF_COUNT_OBJECT_T_CPP
#define TAO_INTRUSIVE_REF_COUNT_OBJECT_T_CPP
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 1413e210b57..aaafac232f0 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Invocation_Adapter.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/operation_details.h"
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index 5a8f80532bf..8571d40c0b5 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Invocation_Base.h"
#include "tao/Stub.h"
#include "tao/operation_details.h"
diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp
index 40c5e745567..b00c7a59f29 100644
--- a/TAO/tao/LF_CH_Event.cpp
+++ b/TAO/tao/LF_CH_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_CH_Event.h"
#include "tao/LF_Follower.h"
#include "tao/debug.h"
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index 5392487765b..3f1ae449589 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Connect_Strategy.h"
#include "tao/Nested_Upcall_Guard.h"
#include "tao/LF_Multi_Event.h"
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index ee456aa9b48..ff281af1e98 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LF_Event.h"
#include "tao/LF_Follower.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp
index 4067f1fdaba..7a052e90f2a 100644
--- a/TAO/tao/LF_Event_Binder.cpp
+++ b/TAO/tao/LF_Event_Binder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Event_Binder.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
index 6fc6697deb8..06c5f807857 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LF_Event_Loop_Thread_Helper.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp
index 466986a79f1..b1bf0a45bff 100644
--- a/TAO/tao/LF_Follower.cpp
+++ b/TAO/tao/LF_Follower.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Follower.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp
index 0c78eff0b80..69e26eb5caf 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ b/TAO/tao/LF_Follower_Auto_Adder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Follower_Auto_Adder.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl
index 17e3b69e291..8c31fcaeb53 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.inl
+++ b/TAO/tao/LF_Follower_Auto_Adder.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp
index b2ae5808061..87aa0780e6c 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.cpp
+++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LF_Follower_Auto_Ptr.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp
index acdd9feb2d4..f19ede1d259 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LF_Invocation_Event.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp
index 0e4d6870ee3..cfca3ecb36d 100644
--- a/TAO/tao/LF_Multi_Event.cpp
+++ b/TAO/tao/LF_Multi_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Multi_Event.h"
#include "tao/Connection_Handler.h"
#include "ace/OS_Memory.h"
diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp
index 1cb7fd5997b..327816a7a94 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Strategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp
index 67472a49429..96628848401 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LF_Strategy_Complete.h"
#include "tao/LF_Follower.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
index cd5502aaf49..3ed8ef1a4e3 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LRU_Connection_Purging_Strategy.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index c048d2bc5a0..18c3fe60b57 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "ace/Reactor.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index e6bd2d95513..0c2763b1a84 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Leader_Follower_Flushing_Strategy.h"
#include "tao/LF_Follower.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index b3d18778280..9ddb386e204 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LocalObject.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 6e6b173d912..deff77755ff 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LocateRequest_Invocation.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/operation_details.h"
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index 04851e0dc85..531dba39b28 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/LocateRequest_Invocation_Adapter.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/operation_details.h"
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 7771b1db2fa..052e31e2cc5 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/MCAST_Parser.h"
#if (TAO_HAS_MCAST_PARSER == 1)
diff --git a/TAO/tao/MMAP_Allocator.cpp b/TAO/tao/MMAP_Allocator.cpp
index a77884aa272..aca4124f7b1 100644
--- a/TAO/tao/MMAP_Allocator.cpp
+++ b/TAO/tao/MMAP_Allocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/MMAP_Allocator.h"
#if TAO_HAS_SENDFILE == 1
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index d836d35c731..cfadbaed48d 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/MProfile.h"
#include "tao/Profile.h"
#include "tao/PolicyC.h"
diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl
index 3854c3c11c8..6622142746f 100644
--- a/TAO/tao/MProfile.inl
+++ b/TAO/tao/MProfile.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 2dd102a5c73..f31f6d6c3a2 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/AMH_Response_Handler.h"
#include "tao/TAO_Server_Request.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp
index 3afeb52af8a..f2781a1b81e 100644
--- a/TAO/tao/Messaging/AMH_Skeletons.cpp
+++ b/TAO/tao/Messaging/AMH_Skeletons.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/AMH_Skeletons.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
index cd8b775a038..d47234ebb0d 100644
--- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/AMI_Arguments_Converter_Impl.h"
#include "tao/operation_details.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index e61f37067f0..af7ebc612a5 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Asynch_Invocation.h"
#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index ca52ada01e4..67accf14266 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Asynch_Invocation_Adapter.h"
#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
#include "tao/Messaging/Asynch_Invocation.h"
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index f631abe4bed..91e946224f2 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
#include "tao/Pluggable_Messaging_Utils.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
index 267e897a680..65677de2656 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Asynch_Timeout_Handler.h"
#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
index 86438d796e9..f6f4993050e 100644
--- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Buffering_Constraint_Policy.h"
#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 3cf4d666914..ee9cbf65964 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Connection_Timeout_Policy_i.h"
#include "tao/ORB_Core.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index fbe923dbf53..af570186111 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/ExceptionHolder_i.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index cf5ab688e61..afc92538ba0 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Messaging.h"
#include "tao/Messaging/Messaging_Loader.h"
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index aa0b3323aa4..bd25ad2d9e2 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Messaging_Loader.h"
#include "tao/Messaging/Messaging_ORBInitializer.h"
#include "tao/Messaging/AMI_Arguments_Converter_Impl.h"
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index c33530ed796..54f0747569a 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Messaging_ORBInitializer.h"
#include "tao/Messaging/Messaging_Policy_i.h"
#include "tao/Messaging/Connection_Timeout_Policy_i.h"
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index fa13e41c642..6b29240b630 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Messaging/Messaging_PolicyFactory.h"
#include "tao/Messaging/Messaging_Policy_i.h"
#include "tao/Messaging/Connection_Timeout_Policy_i.h"
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index 8670baeeba7..a3aadf66749 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Messaging_Policy_i.h"
#include "tao/Stub.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
index c065df48145..a7934859360 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Messaging_Queueing_Strategies.h"
#include "tao/Messaging/Buffering_Constraint_Policy.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/Messaging/messaging_export.h b/TAO/tao/Messaging/messaging_export.h
index d9423b64ca8..8cd382602f3 100644
--- a/TAO/tao/Messaging/messaging_export.h
+++ b/TAO/tao/Messaging/messaging_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp
index 70e4faff70b..ea13255cb38 100644
--- a/TAO/tao/Monitor/Monitor.cpp
+++ b/TAO/tao/Monitor/Monitor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Monitor/Monitor.h"
#include "tao/Monitor/Monitor_Impl.h"
diff --git a/TAO/tao/Monitor/Monitor_Impl.cpp b/TAO/tao/Monitor/Monitor_Impl.cpp
index 5854fda6f04..1014770e978 100644
--- a/TAO/tao/Monitor/Monitor_Impl.cpp
+++ b/TAO/tao/Monitor/Monitor_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Monitor/Monitor_Impl.h"
#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
diff --git a/TAO/tao/Monitor/Monitor_export.h b/TAO/tao/Monitor/Monitor_export.h
index ac83cef2c3d..32dc3a16afb 100644
--- a/TAO/tao/Monitor/Monitor_export.h
+++ b/TAO/tao/Monitor/Monitor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 3b634593918..e9a6c678745 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Muxed_TMS.h"
#include "tao/Reply_Dispatcher.h"
#include "tao/debug.h"
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
index 96dc2e56a31..a1b542673cc 100644
--- a/TAO/tao/NVList_Adapter.cpp
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/NVList_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Network_Priority_Protocols_Hooks.cpp b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
index 32c8cc7e6ce..db6e3aaea66 100644
--- a/TAO/tao/Network_Priority_Protocols_Hooks.cpp
+++ b/TAO/tao/Network_Priority_Protocols_Hooks.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Network_Priority_Protocols_Hooks.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp
index 14a0883c931..e490ae08f73 100644
--- a/TAO/tao/New_Leader_Generator.cpp
+++ b/TAO/tao/New_Leader_Generator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/New_Leader_Generator.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp
index 7146119c73e..d41d7f42d34 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.cpp
+++ b/TAO/tao/Null_Fragmentation_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Null_Fragmentation_Strategy.h"
TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void)
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 3c0af47ba17..309110a79cc 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORBInitializer_Registry.h"
#include "tao/ORBInitializer_Registry_Adapter.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
index 222581e8ea6..874bca2e5fc 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORBInitializer_Registry_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 3250e2ed4de..b8a11f5cec0 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/ORB_Core_TSS_Resources.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp
index dbfa1082fc3..44b464abf54 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB_Core_Auto_Ptr.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp
index a16d8432902..7e554596102 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core_TSS_Resources.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 64ab01f4cff..d31aea67b24 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Table.h"
#include "tao/ORB_Core.h"
#include "tao/TAO_Singleton.h"
diff --git a/TAO/tao/ORB_Time_Policy.cpp b/TAO/tao/ORB_Time_Policy.cpp
index 10846b7a03c..a8c9fe9672a 100644
--- a/TAO/tao/ORB_Time_Policy.cpp
+++ b/TAO/tao/ORB_Time_Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Time_Policy.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index 3bb997409a4..fa7b87bf276 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h"
#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index b8247f25822..f37408a2986 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index d4380e4e8bb..f056136bd08 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/ObjRefTemplate/ort_export.h b/TAO/tao/ObjRefTemplate/ort_export.h
index 3da9ca420ee..b2f6c04d93a 100644
--- a/TAO/tao/ObjRefTemplate/ort_export.h
+++ b/TAO/tao/ObjRefTemplate/ort_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index c4488fb8f33..328df7abc63 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ObjectKey_Table.h"
#include "tao/ORB_Core.h"
#include "tao/Refcounted_ObjectKey.h"
diff --git a/TAO/tao/ObjectKey_Table.inl b/TAO/tao/ObjectKey_Table.inl
index 8670aa0d8c5..0a9cb33d70e 100644
--- a/TAO/tao/ObjectKey_Table.inl
+++ b/TAO/tao/ObjectKey_Table.inl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Refcounted_ObjectKey.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index 1557ba3ebdc..85db86a0193 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OBJECT_ARGUMENT_T_CPP
#define TAO_OBJECT_ARGUMENT_T_CPP
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index 0318b7635fd..3dc0eb22099 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Object_Loader.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
index 1f2a8687961..f5f4c45eff0 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Object_Proxy_Broker.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index ff6a399f1cb..3b2bf7360bc 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Object_Ref_Table.h"
#include "tao/ORB.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 69175478970..359910e0daf 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OBJECT_T_CPP
#define TAO_OBJECT_T_CPP
diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp
index 4794c81b634..92a64351569 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_OBJREF_VAROUT_T_CPP
#define TAO_OBJREF_VAROUT_T_CPP
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
index c72f4c85f87..2c78bf33cb6 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/On_Demand_Fragmentation_Strategy.h"
diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index 1ba728063e3..b070590cf32 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ClientRequestDetails.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 9dc4e619e1c..708891e7674 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ClientRequestInfo.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 1dd530b20d9..6d746b2ea5a 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index a1fec68d4a5..8e9cdd52325 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PI_includeC.h"
#include "tao/ORB_Constants.h"
#include "tao/debug.h"
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 18e844abf28..1006abbccec 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ORBInitInfo.h"
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index c26ae569a63..c74c4f5e385 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ORBInitializer_Registry_Impl.h"
#include "tao/PI/ORBInitInfo.h"
#include "tao/PI/PICurrent.h"
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index ee404ae02b5..4a8dde4d7a1 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PI.h"
#include "tao/PI/ORBInitializer_Registry_Impl.h"
#include "tao/PI/PolicyFactory_Loader.h"
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 444457c3346..2a673e1eb3f 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PICurrent.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 0f3d6ab4115..3c3ae41dd95 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PICurrent_Impl.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index f76fe987f3d..5aa02eea3a9 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI/PI_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
index cf5953d0f93..a8f5ad4b9c6 100644
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ b/TAO/tao/PI/PI_PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PI_PolicyFactory.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index 56c04f34765..0ff905feef5 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/PolicyFactory_Registry.h"
#include "tao/PI/PolicyFactoryC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 26e2a60a021..046e5014ac4 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ProcessingModePolicy.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 91dfc168581..29ec2f53511 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI/RequestInfo_Util.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI/pi_export.h b/TAO/tao/PI/pi_export.h
index 73f09e95644..4dabcad3318 100644
--- a/TAO/tao/PI/pi_export.h
+++ b/TAO/tao/PI/pi_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index af46cf21f0e..87500e8ff82 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/PICurrent_Guard.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp
index e17c2c8fad2..0c222f5d26b 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server.h"
#include "tao/PI_Server/PI_Server_Loader.h"
#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index 11f62ea0fc0..6971657efc8 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_Loader.h"
#include "tao/PI_Server/PortableServer_ORBInitializer.h"
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 4e043d47252..8addc7d9365 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/PortableServer_ORBInitializer.h"
#include "tao/PI_Server/PortableServer_PolicyFactory.h"
#include "tao/debug.h"
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index 462a5749cb7..9318c7f0193 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/PortableServer_PolicyFactory.h"
#include "tao/PortableServer/ThreadPolicy.h"
#include "tao/PortableServer/LifespanPolicy.h"
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 59bfa480e95..d0cf73ac879 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/ServerInterceptorAdapter.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index a5934d27df9..5ff18752ff7 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/ServerRequestDetails.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index b2dfbab6edb..bd0a9afa68b 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PI_Server/ServerRequestInfo.h"
#if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/tao/PI_Server/pi_server_export.h b/TAO/tao/PI_Server/pi_server_export.h
index 01a9c75af1c..bd30915db9b 100644
--- a/TAO/tao/PI_Server/pi_server_export.h
+++ b/TAO/tao/PI_Server/pi_server_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index efbf86d4a06..cd35119b474 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Parser_Registry.h"
#include "tao/IOR_Parser.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
index a34d165dc31..6c75b805ad4 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PolicyFactory_Registry_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index ba90e53baa4..a4ec5b8a0dd 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Policy_Current.h"
#if (TAO_HAS_CORBA_MESSAGING == 1)
diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp
index 5fc1b88716e..3c54e75dde6 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Policy_Current_Impl.h"
#if (TAO_HAS_CORBA_MESSAGING == 1)
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 353f5000946..fbfaea4a28b 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Policy_Manager.h"
#if (TAO_HAS_CORBA_MESSAGING == 1)
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index b4e23df379b..bd3507cfebb 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Policy_Set.h"
#include "tao/SystemException.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index 1edb5349d8b..8cacaf38dc9 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Policy_Validator.h"
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index b89a7dce30e..926749e8204 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Acceptor_Filter_Factory.h"
#include "tao/PortableServer/Default_Acceptor_Filter.h"
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 6197d346b35..706cd08e023 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Active_Object_Map.h"
#include "tao/PortableServer/Active_Object_Map_Entry.h"
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
index 61041390c8b..84d938be575 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Active_Object_Map_Entry.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index ce322b8f0e8..c67e751dd84 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Active_Policy_Strategies.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index a69b65eb075..292af28f3fe 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BD_STRING_SARGUMENT_T_CPP
#define TAO_BD_STRING_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index 7854e33eee0..b94ab234a86 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BASIC_SARGUMENT_T_CPP
#define TAO_BASIC_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
index 2c36b1863ad..c0624954643 100644
--- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
+++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Collocated_Arguments_Converter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
index e9ee2dade56..65a764fcb0a 100644
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Creation_Time.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index a8786cbabaf..7c4a1d1412e 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Default_Acceptor_Filter.h"
#include "tao/Transport_Acceptor.h"
#include "tao/MProfile.h"
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 8e19fb20bcb..1c852f9d8a4 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Default_Policy_Validator.h"
#include "tao/ORB_Core.h"
#include "tao/Policy_Set.h"
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 20b16a3dbc5..ec83ebed582 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Default_Servant_Dispatcher.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Network_Priority_Hook.h"
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 56e68d482d9..09f21adaec4 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
#if (TAO_HAS_MINIMUM_CORBA == 0)
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 3767425538c..7ffd4bb26f4 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP
#define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index 285d90da9c5..ae9db025549 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP
#define TAO_FIXED_SIZE_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index c564ce60c39..449065c15c2 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdAssignmentPolicy.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index 504f311821d..aa56af91575 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 0e35e72667f..35a5119f07d 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h"
#include "tao/PortableServer/IdAssignmentStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
index 79dbb0f6e21..dd95809054b 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategySystem.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
index e30a3b897fe..8a70ac0e4b1 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdAssignmentStrategyUser.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index d4e8360b914..aedf4a9b876 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdUniquenessPolicy.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index 20d16cf497b..1d6a722f548 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h"
#include "tao/PortableServer/IdUniquenessStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 338f133ab6a..fde3e6c68e2 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index ef86863e04d..de5e3c291f4 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index 884b5b7157e..037d8733c2f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
index 310cf51b8db..a21645d1b04 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImR_Client_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index 139dd439472..a2429e9d9a0 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationPolicy.h"
#include "tao/PortableServer/PortableServer.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index 4f825caab71..41e8002c1c9 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
index 29455fc7a9f..30859b6a30e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 0ad1d25ed95..a488aeaa7c9 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
index e50ad89be99..c7694743bad 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
#if !defined (CORBA_E_MICRO) && !defined (CORBA_E_COMPACT)
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index c8c9d520c30..c7ccba1f38c 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Key_Adapters.h"
#include "ace/ACE.h"
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index 87a41ea8abb..e9d7a4bcd43 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanPolicy.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index cba6cc54506..d7e4388c991 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
#include "tao/PortableServer/LifespanStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index bbf189d97f2..c20461a0a74 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyPersistent.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/POAManager.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index 21c978c7dec..e5c8f46a06f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/LifespanStrategyPersistent.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index afe60a9b338..a701ad0398c 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyTransient.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index f95bd64abbe..522eeee81b9 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
#include "ace/Dynamic_Service.h"
#include "tao/PortableServer/LifespanStrategyTransient.h"
diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
index b1965c31be2..5a31a807668 100644
--- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp
+++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Network_Priority_Hook.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index 0c99cbe2881..e00befdbd1d 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Non_Servant_Upcall.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index 99d72a4ee81..e499d3aa1b0 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ORT_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 315d6d19c9f..74af2512196 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Non_Servant_Upcall.h"
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
index 9461e6264d9..5bf4c071810 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Object_Adapter_Factory.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index 163a0813883..b3289bcd7e5 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OBJECT_SARGUMENT_T_CPP
#define TAO_OBJECT_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 13e7de29186..51d1022d3cb 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Operation_Table.h"
#include "tao/ORB.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index e03cc272ccd..bff7610bab2 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Binary_Search.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index 6674ec34112..5f8f5eda365 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Dynamic_Hash.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 7f74c9b14b0..58505e0f0ca 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Linear_Search.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 8bda68e2ab6..c6f94fc891e 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
#include "tao/Timeprobe.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index b1525a38043..bd72b717853 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAManager.h"
#include "tao/PortableServer/POAManagerFactory.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index d4e04746ab1..bc1b2cb69c7 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/POAManagerFactory.h"
#include "tao/PortableServer/POAManager.h"
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 9c2c871978c..64b5098bdfe 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Cached_Policies.h"
#include "tao/PortableServer/POA_Policy_Set.h"
#include "tao/PortableServer/IdAssignmentPolicyC.h"
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index 34712dbbae5..506f938fb96 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/POA_Current.h"
#include "tao/PortableServer/POA_Current_Impl.h"
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 970dcca48f5..7cad00bf77c 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Current_Factory.h"
#include "tao/PortableServer/POA_Current.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index 03ba7d7efa2..a3d4e509474 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- PortableServer Include --
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/POA_Current_Impl.h"
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index abbf64ef1d9..0a2353e4fda 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Guard.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 18c8aa44eff..9b0df5c9089 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POA_Policy_Set.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index 00f1d8f6d04..cf2d613695c 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/PortableServer/PortableServer.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Object_Adapter_Factory.h"
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
index 1d3ca4f2678..853bd2b7ea2 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/PortableServer_Functions.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
index a8dcae59c7e..25fcbaf3738 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer_WFunctions.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index b9dc40d458a..fad1bcc1272 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Regular_POA.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index 033ac4356c2..8145883a4cc 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 37cdca63018..7827a2189b3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB_Constants.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
#include "tao/PortableServer/ServantManagerC.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 2926b1c345e..b47cf080db1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
#include "tao/PortableServer/RequestProcessingStrategy.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 5d32202278f..201a95b1eb2 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 37de98b0d91..2b16cbeca96 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 58fc42ee29d..4e08fdbc1f8 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h"
#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index 3e3b01db9fa..52082c26dd2 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 243c668dbf1..0bed4c8c56d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index e1beec91ede..e83bd3afe65 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index 10fe91d4753..d0d9c811d16 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 2a7241cb207..73981faf582 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 497ed456c83..a8d0dc1ba64 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Regular_POA.h"
diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp
index 366b1c8a6fa..6ccba4791cb 100644
--- a/TAO/tao/PortableServer/SUpcall_commands.cpp
+++ b/TAO/tao/PortableServer/SUpcall_commands.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/SUpcall_commands.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index fcf4cd21f7e..c716959b96f 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index ebf256b0a4f..79988662a34 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
#include "tao/PortableServer/ServantRetentionStrategy.h"
#include "tao/debug.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index bc00bd2f036..cf399e19de6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index b530d045063..dc226731af2 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
#include "tao/PortableServer/ServantRetentionStrategy.h"
#include "tao/PortableServer/ServantRetentionStrategyRetain.h"
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 269da3c3fdc..9abb539aab1 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Servant_Base.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/PortableServer/Operation_Table.h"
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index d61fb7e36a7..fe0524cd9d1 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/Servant_Dispatcher.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index e172081ef7c..e08ac1ae707 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Servant_Upcall.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index ee9a2675b01..7786d181e32 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_PORTABLESERVER_SERVANT_VAR_CPP
#define TAO_PORTABLESERVER_SERVANT_VAR_CPP
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 6fc56c84267..8846e19f05b 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
#define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
index e6277bf7292..dc03abc1ed4 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/StrategyFactory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index a2174748b65..c7f2869db2b 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index 085784f481a..7b36ab1a869 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ThreadStrategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index c9281b877e7..8a6b8f49b1a 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/ThreadStrategyFactoryImpl.h"
#include "tao/PortableServer/ThreadStrategy.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index 4b638689160..e611c4e193b 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/PortableServer/ThreadStrategyORBControl.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
index 040a2ad69d9..00840d2f40f 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index 28ee4688c2d..a89644c05b0 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index d66915ae066..dc9cd4b4b93 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_UB_STRING_SARGUMENT_T_CPP
#define TAO_UB_STRING_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index 050d1853f5e..52dc05020e2 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Upcall_Command.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 746830cf864..7b1036012b4 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/Upcall_Wrapper.h"
#include "tao/PortableServer/Upcall_Command.h"
#include "tao/PortableServer/Collocated_Arguments_Converter.h"
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index 70600dbfbbd..199c000a022 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP
#define TAO_VAR_ARRAY_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index eb1e13e4cb3..bd8aadcc542 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP
#define TAO_VAR_SIZE_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
index a55fed0717e..c813f99ed9e 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VECTOR_SARGUMENT_T_CPP
#define TAO_VECTOR_SARGUMENT_T_CPP
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index a3504f16672..5be8ff1fc58 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_POA_MACROS_H
#define TAO_POA_MACROS_H
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
index 81c9200c157..ba60584a27b 100644
--- a/TAO/tao/PortableServer/portableserver_export.h
+++ b/TAO/tao/PortableServer/portableserver_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index f552ab086ae..c7934c3238b 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Copyright 1994-1995 by Sun Microsystems Inc.
// All Rights Reserved
// ORB: Principal identifier pseudo-objref
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 7038265ead7..2c332b8fb03 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Profile.h"
#include "tao/Messaging_PolicyValueC.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 3cd827bb48e..4423d4a25fe 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Profile_Transport_Resolver.h"
#include "tao/Profile.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index 8b3b879ccf1..d8572873fe1 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Protocol_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp
index 257588d025c..cc344282e8d 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Protocols_Hooks.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp
index 9d325bfb89a..ae7c53401a5 100644
--- a/TAO/tao/Pseudo_VarOut_T.cpp
+++ b/TAO/tao/Pseudo_VarOut_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_PSEUDO_VAROUT_T_CPP
#define TAO_PSEUDO_VAROUT_T_CPP
diff --git a/TAO/tao/QtResource/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc
index 1055dbe4f22..4d30a4b84d0 100644
--- a/TAO/tao/QtResource/QtResource.mpc
+++ b/TAO/tao/QtResource/QtResource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults {
sharedname = TAO_QtResource
dynamicflags += TAO_QTRESOURCE_BUILD_DLL
diff --git a/TAO/tao/QtResource/TAO_QtResource_Export.h b/TAO/tao/QtResource/TAO_QtResource_Export.h
index 1e61d00a1c0..b448b56db21 100644
--- a/TAO/tao/QtResource/TAO_QtResource_Export.h
+++ b/TAO/tao/QtResource/TAO_QtResource_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_QtResource
// ------------------------------
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index 9e636c75944..88806f10973 100644
--- a/TAO/tao/Queued_Data.cpp
+++ b/TAO/tao/Queued_Data.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Queued_Data.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
index ce559374f08..f279c7b4b57 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Queued_Message.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl
index 43ab83bc0af..e3a6cf8b456 100644
--- a/TAO/tao/Queued_Message.inl
+++ b/TAO/tao/Queued_Message.inl
@@ -1,5 +1,3 @@
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE TAO_Queued_Message *
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index 517747bee39..18856e3bcaa 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/Continuous_Priority_Mapping.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 7b2b722bcb5..5c48e423064 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 72bf59a71b9..d75f78da5c4 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
index 5bdbd659f4f..102c44a7c35 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index 94d168a0e76..2e0736adb61 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
index f56d6466603..725fccc42bd 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#include "tao/RTCORBA/Network_Priority_Mapping.h"
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
index 96bbdfa763a..397351e07ff 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index 2405f987196..c44c70f710f 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 93ad7929f60..8ab26007dbf 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 479959a4c2b..3cb27c57f13 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RTCORBA.h"
#if TAO_HAS_CORBA_MESSAGING == 1
diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h
index 978a7af8d15..b6864234547 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//=============================================================================
/**
* @file RTCORBA.h
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 9c9f39c4247..3a639f5b55c 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Current.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index 49bb29b57e2..b4bdd788a0f 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index aefc780495f..6e438394e39 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Endpoint_Utils.h"
#include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 95a4ae1a1df..ece8bd20950 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 85bbfc70d10..d129d4e2de4 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/RTCORBA/RT_Mutex.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index c9dcbe0b080..1505d6a7a28 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_ORB.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index f68cd7b8ed9..6e1c7c1f074 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_ORBInitializer.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index a7b6133ef7f..4ba033315b0 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_ORB_Loader.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 28649a37e37..4c5dc4ae605 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_PolicyFactory.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index df708a40ba4..68a75b7a4cb 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Policy_i.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 9a3ddad05e0..40da1458847 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Protocols_Hooks.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
index 11895e71006..2f4d823ff37 100644
--- a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
+++ b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Service_Context_Handler.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 20788468ad5..e21df158c99 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Stub.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index ddcb74c4169..7e3dc469d04 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/RTCORBA/RT_Stub_Factory.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index c0c408ccfd8..fa7a572ad1f 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
index a71f3540b27..b429de80109 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Transport_Descriptor.h"
#include "ace/OS_Memory.h"
diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
index 7b592e0a1f7..0b7150a9c5b 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
#include "ace/OS_Memory.h"
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 84e0d645154..4b13e1a0b76 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/Thread_Pool.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTCORBA/rtcorba_export.h b/TAO/tao/RTCORBA/rtcorba_export.h
index e712f3013ce..13947d38785 100644
--- a/TAO/tao/RTCORBA/rtcorba_export.h
+++ b/TAO/tao/RTCORBA/rtcorba_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
index dd1684d77a3..d5282f46146 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTPortableServer/RT_Acceptor_Filters.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index f13f5769020..763754e43d0 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTPortableServer/RT_Collocation_Resolver.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index 7117827b810..6f63f05e236 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 73162b0032b..c6c43ce7210 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTPortableServer/RT_POA.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index a5345dc9426..60d6da68d9b 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/RTPortableServer/RT_Policy_Validator.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index c753eab7ea4..c2723bf3462 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/RTPortableServer/rtportableserver_export.h b/TAO/tao/RTPortableServer/rtportableserver_export.h
index 94bb07fc254..61c0e1a243a 100644
--- a/TAO/tao/RTPortableServer/rtportableserver_export.h
+++ b/TAO/tao/RTPortableServer/rtportableserver_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index ba0d8928ba9..0635fcc691b 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/RTScheduling/Current.h"
#include "tao/RTScheduling/Distributable_Thread.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp
index 27b5382c077..938f09b7d94 100644
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTScheduling/RTScheduler.h"
#include "tao/RTScheduling/RTScheduler_Loader.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h
index 3dbcb0553b9..fbfd458338c 100644
--- a/TAO/tao/RTScheduling/RTScheduler.h
+++ b/TAO/tao/RTScheduling/RTScheduler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//=============================================================================
/**
* @file RTScheduler.h
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index f69259b7ed9..e2203898718 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/RTScheduling/RTScheduler_Initializer.h"
#include "tao/RTScheduling/Request_Interceptor.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index 9e127aab5a3..2b38b663a46 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTScheduling/RTScheduler_Loader.h"
#include "tao/RTScheduling/RTScheduler_Initializer.h"
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
index bcd1c5da174..a4c71837e35 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/RTScheduling/RTScheduler_Manager.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/tao/RTScheduling/rtscheduler_export.h b/TAO/tao/RTScheduling/rtscheduler_export.h
index 6ebbee7d77b..1eb29e8202e 100644
--- a/TAO/tao/RTScheduling/rtscheduler_export.h
+++ b/TAO/tao/RTScheduling/rtscheduler_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_RTScheduler
// ------------------------------
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 4a9e04ee050..9af1d96c729 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Reactive_Connect_Strategy.h"
#include "tao/Connection_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 9f1ba2e5817..9cd855e8bf0 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Reactive_Flushing_Strategy.h"
#include "tao/Transport.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp
index 053be83afcb..5c87170bbbc 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Refcounted_ObjectKey.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl
index 444ea27d38f..eaef9e967cd 100644
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ b/TAO/tao/Refcounted_ObjectKey.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE void
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index 3d5d61b6032..390d2d7c1b4 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Remote_Object_Proxy_Broker.h"
#include "tao/CORBA_String.h"
#include "tao/UB_String_Arguments.h"
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 09d87b13dfc..a2ebe2f4838 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Reply_Dispatcher.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index eed80b6d415..16a77d9459c 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Request_Dispatcher.h"
#include "tao/TAO_Server_Request.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index 6b050ea23c3..46dc712b08a 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Resource_Factory.h"
#include "tao/Protocol_Factory.h"
#include "tao/orbconf.h"
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 12019966ad6..6f1ad90b807 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Resume_Handle.h"
#include "tao/ORB_Core.h"
#include "debug.h"
diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp
index 02bc2c7f89f..1be4063675d 100644
--- a/TAO/tao/Seq_Out_T.cpp
+++ b/TAO/tao/Seq_Out_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SEQ_OUT_T_CPP
#define TAO_SEQ_OUT_T_CPP
diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp
index ddd626a8fce..bc88a3a5904 100644
--- a/TAO/tao/Seq_Var_T.cpp
+++ b/TAO/tao/Seq_Var_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SEQ_VAR_T_CPP
#define TAO_SEQ_VAR_T_CPP
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index df6962d4019..ae240384860 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Unbounded_Octet_Sequence_T.h"
#include "tao/Unbounded_Value_Sequence_T.h"
#include "tao/Unbounded_Basic_String_Sequence_T.h"
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
index b681460417c..ff032bbdb59 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ServerRequestInterceptor_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
index 6bc92e719ff..be5ff8d08c5 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ServerRequestInterceptor_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index d918685946f..94b91cbaf42 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Server_Strategy_Factory.h"
#include "tao/orbconf.h"
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 2bffb937c81..b830c4d863c 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Service_Callbacks.h"
#include "tao/ORB_Constants.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index c461714e4c3..b7961c0af1b 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Service_Context.h"
#include "tao/CDR.h"
diff --git a/TAO/tao/Service_Context_Handler.cpp b/TAO/tao/Service_Context_Handler.cpp
index 700b73c9d0b..b6d2800fd34 100644
--- a/TAO/tao/Service_Context_Handler.cpp
+++ b/TAO/tao/Service_Context_Handler.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Service_Context_Handler.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Context_Handler_Registry.cpp b/TAO/tao/Service_Context_Handler_Registry.cpp
index 2e2ea916b99..7cf3a049332 100644
--- a/TAO/tao/Service_Context_Handler_Registry.cpp
+++ b/TAO/tao/Service_Context_Handler_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Service_Context_Handler_Registry.h"
#include "tao/TAO_Server_Request.h"
#include "tao/Service_Context_Handler.h"
diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp
index 1e03a3fb4a0..6fffafa3c84 100644
--- a/TAO/tao/Services_Activate.cpp
+++ b/TAO/tao/Services_Activate.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Services_Activate.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index 0d3c65def83..8b9e0bb343d 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/SmartProxies/Smart_Proxies.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/SmartProxies/smartproxies_export.h b/TAO/tao/SmartProxies/smartproxies_export.h
index 62fb3430f21..f14956a8fdf 100644
--- a/TAO/tao/SmartProxies/smartproxies_export.h
+++ b/TAO/tao/SmartProxies/smartproxies_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index 68527466fdd..d4bae6000e7 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
#define TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp
index c753dc55702..9806ee84272 100644
--- a/TAO/tao/Strategies/COIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/COIOP_Acceptor.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
index 28c31505e0d..9bfb2864ac4 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/COIOP_Connection_Handler.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 25ddaccc61c..5846b47c44e 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/COIOP_Connector.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 103c924601e..1c51cc45226 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/COIOP_Endpoint.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp
index 6e2dfa0d3b7..00a5ad1d67f 100644
--- a/TAO/tao/Strategies/COIOP_Factory.cpp
+++ b/TAO/tao/Strategies/COIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/COIOP_Factory.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index e45c29db741..0e1db4b6eea 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/COIOP_Profile.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index f8e83010178..1638a38763b 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/COIOP_Transport.h"
#if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 2f72680a7ed..166d0222916 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/DIOP_Acceptor.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 12ae11fbeb9..3479e3eca92 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/DIOP_Connection_Handler.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index c09033cb43f..361ba6ed9b7 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/DIOP_Connector.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index 711c9c93338..e616cb66c9e 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/DIOP_Endpoint.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index 40b455412ac..055afeaa5a1 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/DIOP_Factory.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 97b21207238..852b24d9f5e 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/DIOP_Profile.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index ba4f63f3355..d2ffe5ef408 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/DIOP_Transport.h"
#if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index 45c2db6e2fb..50bec206b7a 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index e0e6449b77d..a05463d5781 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index 70c76057700..e4c897391e0 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/LF_Strategy_Null.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.inl b/TAO/tao/Strategies/LF_Strategy_Null.inl
index c073be304e7..2eecd74fa73 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.inl
+++ b/TAO/tao/Strategies/LF_Strategy_Null.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
TAO_LF_Strategy_Null::TAO_LF_Strategy_Null (void)
{
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 554ff460898..29cb374e9c7 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index 785ce512c8e..1e023180cee 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
#include "tao/Strategies/Strategies_ORBInitializer.h"
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index 8a889701104..656d238970b 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 0151e4766f7..65e10a506ff 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Acceptor.h"
#include "tao/Strategies/SCIOP_Profile.h"
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index 9b6428d3a18..d386e78f29e 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// ===================================================================
/*
* @file SCIOP_Acceptor.h
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 66e43ea20bd..ca78a469494 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Connection_Handler.h"
#if TAO_HAS_SCIOP == 1
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index 823e684a3f2..450c9c1abc3 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// ===================================================================
/**
* @file SCIOP_Connection_Handler.h
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index df61f931f78..3f88e558447 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Connector.h"
#include "tao/Strategies/SCIOP_Profile.h"
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index ce9da4a1318..d8464221ec0 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//=============================================================================
/**
* @file SCIOP_Connector.h
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 91c43e680b7..c2c0d330ff7 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Endpoint.h"
#if TAO_HAS_SCIOP == 1
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.inl b/TAO/tao/Strategies/SCIOP_Endpoint.inl
index 2174f62be7b..41d5ea3712c 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.inl
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const char *
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 5976cefa1ca..751ce499473 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Factory.h"
#include "tao/Strategies/SCIOP_Acceptor.h"
#include "tao/Strategies/SCIOP_Connector.h"
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index 0705d3b940d..6178e3a1b57 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//=============================================================================
/**
* @file SCIOP_Factory.h
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index ad40eb2aae2..dc81b03e23d 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/SCIOP_Profile.h"
#if TAO_HAS_SCIOP == 1
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index ab959ab26ed..fa17942ca95 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SCIOP_Transport.h"
#if TAO_HAS_SCIOP == 1
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index ca18378a5e5..6b954f83bce 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// ===================================================================
/**
* @file SCIOP_Transport.h
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 22d9c7f40e3..2a582f8e2a5 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Acceptor.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h
index 7a598d2086d..118106d1a68 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// ===================================================================
/**
* @file SHMIOP_Acceptor.h
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 2a67896783f..a98a0368370 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Connection_Handler.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 8d3246b590b..2f5e4e426be 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Connector.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
index d17e5622a9a..911c1b14ad4 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Endpoint.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp
index a1d055cf22b..646969d8956 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Factory.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 773bac88a1d..c7291d9ee54 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Profile.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 4a9ac59a84e..70834ff1af1 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/SHMIOP_Transport.h"
#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
diff --git a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
index 326deb6c136..ebb4a6a37a6 100644
--- a/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
+++ b/TAO/tao/Strategies/Strategies_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/Strategies_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index ffb795a72f1..2216712d8a4 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Acceptor.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index ec7d6e7e064..92ee31f5679 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Connection_Handler.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 00b74247ff9..3b9e56f6067 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Connector.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp
index 57060d5421d..c74b5e3468a 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Endpoint.h"
#include "tao/Strategies/UIOP_Connection_Handler.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index c99d2f29191..df2b317a518 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Strategies/UIOP_Factory.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index ce1d6c6bbb6..f4fa10f2067 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Profile.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 09c633c870b..62bb3514b6e 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/UIOP_Transport.h"
#if TAO_HAS_UIOP == 1
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 86cb0754aa0..a51fb3a7df3 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Service_Config.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 13b51dc7f6b..31dc9ca5c91 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_ADVANCED_RESOURCE_H
#define TAO_ADVANCED_RESOURCE_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tao/Strategies/strategies_export.h b/TAO/tao/Strategies/strategies_export.h
index 9ca0498827d..36e14b838e6 100644
--- a/TAO/tao/Strategies/strategies_export.h
+++ b/TAO/tao/Strategies/strategies_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/String_Alloc.cpp b/TAO/tao/String_Alloc.cpp
index 4fecca1daf4..7b6edfaac05 100644
--- a/TAO/tao/String_Alloc.cpp
+++ b/TAO/tao/String_Alloc.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/String_Alloc.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_wchar.h"
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 6536a3328a9..aaa5e1cd849 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Portions Copyright 1995 by Sun Microsystems Inc.
// Portions Copyright 1997-2002 by Washington University
// All Rights Reserved
diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp
index 4709929cbf6..7a29fd40e4d 100644
--- a/TAO/tao/Stub_Factory.cpp
+++ b/TAO/tao/Stub_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Stub_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index d061af4874e..17bb6177a27 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Synch_Invocation.h"
#include "tao/Invocation_Retry_State.h"
#include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 02da7a136f7..28f532469e4 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Synch_Queued_Message.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 60d8afa23d7..fe84771bbfe 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Synch_Reply_Dispatcher.h"
#include "tao/ORB_Core.h"
#include "tao/Pluggable_Messaging_Utils.h"
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 709c60258a0..d966dbd8b0b 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/SystemException.h"
#include "tao/ORB_Constants.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tao/System_Time_Policy_Strategy.cpp b/TAO/tao/System_Time_Policy_Strategy.cpp
index c5834b6841f..30255432059 100644
--- a/TAO/tao/System_Time_Policy_Strategy.cpp
+++ b/TAO/tao/System_Time_Policy_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/System_Time_Policy_Strategy.h"
#include "ace/Timer_Heap_T.h"
diff --git a/TAO/tao/TAO_Export.h b/TAO/tao/TAO_Export.h
index fc49ecbc163..1ca351b2cf8 100644
--- a/TAO/tao/TAO_Export.h
+++ b/TAO/tao/TAO_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index ab88758d119..90f81fdf77d 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TAO_Internal.h"
#include "tao/TAO_Singleton.h"
#include "tao/default_server.h"
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index e0ebaafd7ab..81c8828191f 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TAO_Server_Request.h"
#include "tao/ORB_Core.h"
#include "tao/Timeprobe.h"
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 88a1d7d7114..c928a30d204 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TAO_Singleton_Manager.h"
#include "ace/Guard_T.h"
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index a7a88bf1b08..9f1d44141a6 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TSS_Resources.h"
#include "tao/GUIResource_Factory.h"
#include "tao/TAO_Singleton.h"
diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
index 8a8a0efe2b5..98e233c69e3 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Tagged_Components.h"
#include "tao/CDR.h"
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index 16a5c5e0a91..e1fc756e517 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Tagged_Profile.h"
#include "tao/ORB_Core.h"
#include "tao/Acceptor_Registry.h"
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index e3f9f20b747..edd83b85c5f 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Thread_Lane_Resources.h"
#include "tao/Acceptor_Registry.h"
#include "tao/LF_Follower.h"
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp
index 76b2ed45db3..feac67c8c5f 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Thread_Lane_Resources_Manager.h"
#include "tao/ORB_Core.h"
#include "tao/LF_Strategy.h"
diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp
index 47f73fa6d65..8d03150147d 100644
--- a/TAO/tao/Time_Policy_Manager.cpp
+++ b/TAO/tao/Time_Policy_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Time_Policy_Manager.h"
#include "tao/ORB_Time_Policy.h"
#include "tao/debug.h"
diff --git a/TAO/tao/TkResource/TAO_TkResource_Export.h b/TAO/tao/TkResource/TAO_TkResource_Export.h
index 34904a6d9af..415eeba821e 100644
--- a/TAO/tao/TkResource/TAO_TkResource_Export.h
+++ b/TAO/tao/TkResource/TAO_TkResource_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_TkResource
// ------------------------------
diff --git a/TAO/tao/TkResource/TkResource.mpc b/TAO/tao/TkResource/TkResource.mpc
index e0c3026f067..bf46b62e39f 100644
--- a/TAO/tao/TkResource/TkResource.mpc
+++ b/TAO/tao/TkResource/TkResource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
project(TAO_TkResource) : acelib, taolib, install, tao_output, taodefaults, ace_tkreactor, taoidldefaults {
sharedname = TAO_TkResource
dynamicflags += TAO_TKRESOURCE_BUILD_DLL
diff --git a/TAO/tao/TkResource/TkResource_Loader.cpp b/TAO/tao/TkResource/TkResource_Loader.cpp
index 53b2a4739fa..23308831d6f 100644
--- a/TAO/tao/TkResource/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource/TkResource_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TkResource/TkResource_Loader.h"
#include "tao/ORB_Core.h"
#include "tao/TkResource/TkResource_Factory.h"
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index f6f27c18017..7db8fce9ff6 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Transport.h"
#include "tao/LF_Follower.h"
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index cd36b4b844d..60cc585f680 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CURRENT_IMPL_H
#define CURRENT_IMPL_H
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
index be55fa69b0a..668f40aa9f4 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CURRENT_ORBINITIALIZER_CPP
#define CURRENT_ORBINITIALIZER_CPP
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index 23acdbcd1df..62960016660 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PI/ORBInitInfo.h"
#include "tao/TransportCurrent/Current_ORBInitializer_Base.h"
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 2d7a1ff7861..1885d524586 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/INET_Addr.h"
#include "ace/Truncate.h"
#include "tao/IIOP_Connection_Handler.h"
diff --git a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
index c99479cb0b9..7cebab4211c 100644
--- a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
+++ b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef IIOP_TRANSPORT_CURRENT_H
#define IIOP_TRANSPORT_CURRENT_H
diff --git a/TAO/tao/TransportCurrent/Transport_Current.h b/TAO/tao/TransportCurrent/Transport_Current.h
index e9ed39b36ff..bbe6b971eca 100644
--- a/TAO/tao/TransportCurrent/Transport_Current.h
+++ b/TAO/tao/TransportCurrent/Transport_Current.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TRANSPORT_CURRENT_H
#define TRANSPORT_CURRENT_H
diff --git a/TAO/tao/TransportCurrent/Transport_Current_Export.h b/TAO/tao/TransportCurrent/Transport_Current_Export.h
index 44c2f497a71..ea2180d24d7 100644
--- a/TAO/tao/TransportCurrent/Transport_Current_Export.h
+++ b/TAO/tao/TransportCurrent/Transport_Current_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -d TAO_Transport_Current
// ------------------------------
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
index 8afbf059eb6..3ef9deb8982 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Transport_Acceptor.h"
#include "ace/Reactor.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index eba839a3e95..d66c1307d1e 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Transport_Connector.h"
#include "tao/Transport.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index 23c04a89277..fe038e33c63 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Transport_Descriptor_Interface.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index cbefdeed656..f2c3d15618a 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Transport_Mux_Strategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index b5428c505a3..6343041843d 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Transport_Queueing_Strategies.h"
#include "tao/Stub.h"
#include "tao/debug.h"
diff --git a/TAO/tao/Transport_Selection_Guard.cpp b/TAO/tao/Transport_Selection_Guard.cpp
index 2f21a875f90..9f516a1e36b 100644
--- a/TAO/tao/Transport_Selection_Guard.cpp
+++ b/TAO/tao/Transport_Selection_Guard.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Transport_Selection_Guard.h"
#include "tao/TSS_Resources.h"
diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp
index 5ce8bca080b..081692f209b 100644
--- a/TAO/tao/Transport_Timer.cpp
+++ b/TAO/tao/Transport_Timer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Transport_Timer.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 38aa0363b30..11ab6b5f086 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index eb189ff69b4..e3fa279fe4c 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
#include "tao/AnyTypeCode/Marshal.h"
diff --git a/TAO/tao/TypeCodeFactory/typecodefactory_export.h b/TAO/tao/TypeCodeFactory/typecodefactory_export.h
index 03bfa7334ab..221d309fab1 100644
--- a/TAO/tao/TypeCodeFactory/typecodefactory_export.h
+++ b/TAO/tao/TypeCodeFactory/typecodefactory_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index 54fc4f61728..ed855ffc906 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TypeCodeFactory_Adapter.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a084966cc99..c49630b75d4 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_UB_STRING_ARGUMENT_T_CPP
#define TAO_UB_STRING_ARGUMENT_T_CPP
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index bfb82367587..34bf89289d5 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/UserException.h"
#include "ace/SString.h"
diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp
index c9c484f549c..15bebee3752 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/Encodable.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index f681c20b7de..0115d46cf88 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/Implicit_Deactivator.h"
#include "tao/PortableServer/Servant_Base.h"
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 593f50b40f4..1d33628198b 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/ORB_Destroyer.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 2edd4871992..808982f2e06 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// = AUTHOR
// Sumedh Mungee <sumedh@cs.wustl.edu>
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index 5e15e55e325..f4e06fcbc1c 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/PolicyList_Destroyer.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index ebc014d499e..e8ad3425bea 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_UTILS_RIR_NARROW_CPP
#define TAO_UTILS_RIR_NARROW_CPP
diff --git a/TAO/tao/Utils/Utils.mpc b/TAO/tao/Utils/Utils.mpc
index 70a2631a5dc..05d269f31c2 100644
--- a/TAO/tao/Utils/Utils.mpc
+++ b/TAO/tao/Utils/Utils.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (TAO_Utils) : taolib, tao_output, install, portableserver, pi {
sharedname = TAO_Utils
dynamicflags = TAO_UTILS_BUILD_DLL
diff --git a/TAO/tao/Utils/utils_export.h b/TAO/tao/Utils/utils_export.h
index 5cf8c0c40a0..69b74f4a69b 100644
--- a/TAO/tao/Utils/utils_export.h
+++ b/TAO/tao/Utils/utils_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_UTILS
// ------------------------------
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
index e0baa8f930f..658907ff8d9 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h"
#include "tao/Valuetype/AbstractBase.h"
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index 18d9b04672e..f87f48de12a 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ABSTRACT_BASE_T_CPP
#define TAO_ABSTRACT_BASE_T_CPP
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index db9c2c48aa2..385d5266499 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -1,4 +1,3 @@
-// $Id$
//
#include "tao/Valuetype/Bounded_Valuetype_Sequence_T.h"
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 7ba306f73dd..d01a38d9a49 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
index b3c3d24d936..d65e09ed1c0 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Valuetype/ValueFactory.h"
#include "ace/Guard_T.h"
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index 51b1995a2d4..897f7a40bc7 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Valuetype/ValueFactory_Map.h"
#include "tao/Valuetype/ValueFactory.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index feb061920c7..65255c04e5f 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VALUE_VAROUT_T_CPP
#define TAO_VALUE_VAROUT_T_CPP
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 60f7bc81b2f..9d1b8968288 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
#include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h"
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
index b6d7186c006..bd64c481071 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
#include "tao/Valuetype/AbstractBase.h"
#include "tao/Valuetype/ValueBase.h"
diff --git a/TAO/tao/Valuetype/valuetype_export.h b/TAO/tao/Valuetype/valuetype_export.h
index 851fa9a4ea2..4815d2e86a1 100644
--- a/TAO/tao/Valuetype/valuetype_export.h
+++ b/TAO/tao/Valuetype/valuetype_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 6ee56035c49..9dec3450404 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Valuetype_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype_Adapter_Factory.cpp b/TAO/tao/Valuetype_Adapter_Factory.cpp
index dffbe20ca95..e6f12a7d34c 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.cpp
+++ b/TAO/tao/Valuetype_Adapter_Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/Valuetype_Adapter_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp
index 85a31f687e4..f576e87ef4a 100644
--- a/TAO/tao/VarOut_T.cpp
+++ b/TAO/tao/VarOut_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAROUT_T_CPP
#define TAO_VAROUT_T_CPP
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index db9703c12a4..3787d47012a 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_ARRAY_ARGUMENT_T_CPP
#define TAO_VAR_ARRAY_ARGUMENT_T_CPP
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index a2616fff016..bc349533182 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VAR_SIZE_ARGUMENT_T_CPP
#define TAO_VAR_SIZE_ARGUMENT_T_CPP
diff --git a/TAO/tao/Vector_Argument_T.cpp b/TAO/tao/Vector_Argument_T.cpp
index 14a1382a0f9..17c65923526 100644
--- a/TAO/tao/Vector_Argument_T.cpp
+++ b/TAO/tao/Vector_Argument_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_VECTOR_ARGUMENT_T_CPP
#define TAO_VECTOR_ARGUMENT_T_CPP
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 01d3c61128e..773fff6ecd5 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
#define TAO_MAJOR_VERSION 2
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 0ef341036fd..16405fa3774 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Wait_On_LF_No_Upcall.h"
#include "tao/Nested_Upcall_Guard.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index b0571018861..de6873224f4 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Wait_On_Leader_Follower.h"
#include "tao/LF_Follower.h"
#include "tao/Leader_Follower.h"
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 874d108d611..a36cadfa796 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Wait_On_Reactor.h"
#include "tao/ORB_Core.h"
#include "tao/Transport.h"
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index ad785d1ed31..dea06b49050 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Wait_On_Read.h"
#include "tao/Transport.h"
#include "tao/Resume_Handle.h"
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 30e1707ac62..efb90ca1103 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Wait_Strategy.h"
//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
diff --git a/TAO/tao/XtResource/TAO_XtResource_Export.h b/TAO/tao/XtResource/TAO_XtResource_Export.h
index 5cc41d8da11..5def9a0fdf5 100644
--- a/TAO/tao/XtResource/TAO_XtResource_Export.h
+++ b/TAO/tao/XtResource/TAO_XtResource_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s TAO_XtResource
// ------------------------------
diff --git a/TAO/tao/XtResource/XtResource.mpc b/TAO/tao/XtResource/XtResource.mpc
index b925c83e056..f0bf77f78af 100644
--- a/TAO/tao/XtResource/XtResource.mpc
+++ b/TAO/tao/XtResource/XtResource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*- now wouldn't this be cool...
-// $Id$
-
project(TAO_XtResource) : acelib, taolib, install, tao_output, taodefaults, ace_xtreactor, taoidldefaults {
sharedname = TAO_XtResource
dynamicflags += TAO_XTRESOURCE_BUILD_DLL
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp
index c3469cc9fe7..ad2f23caf6a 100644
--- a/TAO/tao/ZIOP/ZIOP.cpp
+++ b/TAO/tao/ZIOP/ZIOP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_ORBInitializer.h"
#include "tao/ZIOP/ZIOP_Policy_Validator.h"
#include "tao/ZIOP/ZIOP.h"
diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
index 294d365d10d..fce6718fe14 100644
--- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
+++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_ORBInitializer.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp b/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
index c0ac5660d0d..c6552c504d7 100644
--- a/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_PolicyFactory.h"
#include "tao/ZIOP/ZIOP.h"
#include "tao/ZIOP/ZIOP_Policy_i.h"
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
index e22be74c97d..91a1dcb91c1 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_Policy_Validator.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
index 1a31b1a54e5..c74ee3336e8 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_Policy_i.h"
#include "tao/CDR.h"
#include "tao/Stub.h"
diff --git a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
index 386e43ec475..03295ed6c2f 100644
--- a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_Service_Context_Handler.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp
index c112a99e5eb..9bc84af9845 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP/ZIOP_Stub.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
index 8f5080d82e4..a9fe731afdf 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/ZIOP/ZIOP_Stub_Factory.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
diff --git a/TAO/tao/ZIOP_Adapter.cpp b/TAO/tao/ZIOP_Adapter.cpp
index 72646df886e..39a38991533 100644
--- a/TAO/tao/ZIOP_Adapter.cpp
+++ b/TAO/tao/ZIOP_Adapter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ZIOP_Adapter.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 86d5ab1c254..eb23405852c 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -1,4 +1,3 @@
-// $Id$
// THREADING NOTE: the global values here (debug_{level,filter,stream)
// are assumed to be modified "safely", e.g. in the main thread as
// part of process initialization. They are treated as immutable
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 8fbf4525689..8edce81619d 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/default_client.h"
#include "tao/Wait_On_Read.h"
#include "tao/Wait_On_Reactor.h"
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index cdca92a61c0..9bcd535662d 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/default_resource.h"
#include "tao/debug.h"
diff --git a/TAO/tao/default_resource.inl b/TAO/tao/default_resource.inl
index c404dc048d3..a4f1ff37eb8 100644
--- a/TAO/tao/default_resource.inl
+++ b/TAO/tao/default_resource.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 74d3888767d..f37c5d498c3 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/default_server.h"
#include "tao/debug.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 0d359bec400..f7763b9f70e 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -1,7 +1,5 @@
// -*- IDL -*-
-// $Id$
-
// Included for compatibility with the CORBA 2 specification.
#ifndef TAO_ORB_IDL
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index a1713eefa31..4d2f7306c5f 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/params.h"
#include "tao/orbconf.h"
#include "tao/Version.h"
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
index c47777077d8..971dbd7566f 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 1f6cb71e638..f76ad509140 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 7f724da1493..83afa65ba63 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_time.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index 8b392a2d14d..03a195dc552 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index e9106a3608e..29df8c17d1b 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "TestC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index f54fffa08c0..88512b95d35 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -1,6 +1,4 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index f46a22df694..bdee73f2b1c 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 2d383c84e22..0ad6d72b136 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 18b21e61445..8c449e083ee 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMI_Buffering_Admin.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 3e722e6dbb0..a323ba68d40 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reply_Handler.h"
#include "Client_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index ca15e6184ec..2c0186d3b12 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMI_Buffering.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index e064d725fd2..42e1f0383ca 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
timeout.idl
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 38681100160..046d40dcfa0 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index f9ce8e86e83..c0de312983e 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 5a825efcfce..43563246979 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Abstract_Interface/test.idl b/TAO/tests/Abstract_Interface/test.idl
index 6a5d9ec4a1c..5f70fbd6655 100644
--- a/TAO/tests/Abstract_Interface/test.idl
+++ b/TAO/tests/Abstract_Interface/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
exception BadInput
{
string message;
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index 57480795547..d194ca19ed1 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index 90fae856475..7c103c98c8e 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_TEST_I_H
#define TAO_TEST_I_H
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.idl b/TAO/tests/Alt_Mapping/alt_mapping.idl
index bd70a846da0..7bd28328100 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.idl
+++ b/TAO/tests/Alt_Mapping/alt_mapping.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Alt_Mapping
{
string test_unbounded_string (in string s1,
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.mpc b/TAO/tests/Alt_Mapping/alt_mapping.mpc
index 44dd5ab336a..a6811c8b9fc 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.mpc
+++ b/TAO/tests/Alt_Mapping/alt_mapping.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags -= -Sa -St
diff --git a/TAO/tests/Any/Indirected/client.cpp b/TAO/tests/Any/Indirected/client.cpp
index 46a7f8bd516..6adaee0394a 100644
--- a/TAO/tests/Any/Indirected/client.cpp
+++ b/TAO/tests/Any/Indirected/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Any/Recursive/NonRecursive.idl b/TAO/tests/Any/Recursive/NonRecursive.idl
index 1ebde843dab..9ecf951bac7 100644
--- a/TAO/tests/Any/Recursive/NonRecursive.idl
+++ b/TAO/tests/Any/Recursive/NonRecursive.idl
@@ -1,4 +1,3 @@
-// $Id$
//
// Non-recursive types for compile-time testing.
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 6d99fc03c9f..ca2d84d4a23 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 976c59d6fe7..0f2070e7c64 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index b950587ff83..a1890184c8d 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 73dc9849790..e1d785b61aa 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 7f25ec3f471..0b3be60d958 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/BiDirectional/test_i.inl b/TAO/tests/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/tests/BiDirectional/test_i.inl
+++ b/TAO/tests/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
index 0e9687ea3bd..5f3978d952a 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
+++ b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 63e24ba38f8..b3766ba9bfc 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index 1bea3072543..1e5a97f204f 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index df7de9fe6bd..2d2ee11a346 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
index afb7011812e..aba644cae6f 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
index 5b30ddc1b1c..3b0e0ea127f 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, anytypecode, bidir_giop, avoids_corba_e_micro {
exename = destroy
Source_Files {
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index a18b24db402..ddffb4b6df8 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 3e74cbe5dc4..9707e6bb829 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 1bea3072543..1e5a97f204f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 91c174281c6..42390e1554a 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index 54e3268e74e..d82060317d2 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index a38f314e5ca..ef6a8e7a6ca 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 5902682fe98..f0520bcce14 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#include "ace/Get_Opt.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 3d484feaa1a..ecec4f69944 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coordinator.h"
#include "Session_Control.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index ca9b2157786..43dc563cd2f 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index f8e4d32b6d4..3ddf68ada38 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index 4db6e458dd1..b2a8aeeb46e 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Big_Reply_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 2e96131b1a6..4350f93a561 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index cfc0343c2d4..b12c3d046bc 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 073a01cec6e..40a9f862369 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc
index a38f314e5ca..ef6a8e7a6ca 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 5902682fe98..f0520bcce14 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#include "ace/Get_Opt.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index bad96d106f0..824a2427154 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coordinator.h"
#include "Session_Control.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index 655e5e0f012..841b71481ff 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 0936113493e..3d1285e6cf5 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index cc426f78414..6e345e14007 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Blocking_Sync_None.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
index 8679ec7077d..cf99d1e778d 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
+++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index f2adcb00f22..743a534c959 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
Client_Task::Client_Task (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
index 038a43fa0e9..527465413b4 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index 00225da7ceb..775f68a3c18 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index c1b36af884d..e8aae406238 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
Server_Task::Server_Task (Test::Echo_ptr echo,
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index a681243525b..35578720d25 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index 5d2ccad9a2b..ca8b03ef5e5 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
index 445797b7b2a..e4ad0687b0e 100644
--- a/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
+++ b/TAO/tests/Bug_1020_Regression/Bug_1020_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp
index 7ba4adf2e3e..4307c9dcf57 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 770c576efd9..b8e4a93e240 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ORB_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index 98c44f068bb..c8e74a999a7 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "ORB_Task.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
index 1a629aa8dcf..855a65659c8 100644
--- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
+++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index d658ef4b1ce..8f87a04bac8 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp
index 6b8406adf8d..ac4911a8e8c 100644
--- a/TAO/tests/Bug_1254_Regression/server.cpp
+++ b/TAO/tests/Bug_1254_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BlobServer.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index 766e26c6e94..9e327377827 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 56ff66d4927..f24ba933291 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 01bf0aa1ebe..a66c693dd37 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/Messaging/Messaging.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index cf65eed282f..2048cbef6ec 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index e14b0303f42..e95cc529515 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 3dda8c71a5a..9d29b0e2d8b 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index e2641efd61d..e933927d62e 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/Messaging/Messaging.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index f8b1987b6d0..98d3f3b5b4d 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index d4952cef96b..d0f85385e84 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index e50d4d3e003..5077727e055 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 083131a18b4..ac1615c8e5d 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Thread_Pool.h"
#include "TestC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
index 4962fc5ec7f..3a899d5e404 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task_T.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index bd9b8da4374..f350bcb6e29 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "ORB_Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 7ca77b344f3..04531c71660 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Caller.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index a128eec709f..23e34e8cdb7 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
index 7e6a55f76da..440b805bbd8 100644
--- a/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
+++ b/TAO/tests/Bug_1383_Regression/Bug_1383_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
callee.idl
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.cpp b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
index 4391097bafd..395feea2a80 100644
--- a/TAO/tests/Bug_1383_Regression/Callee_i.cpp
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callee_i.h"
void Callee_i::callback (const char * message)
diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.h b/TAO/tests/Bug_1383_Regression/Callee_i.h
index 30fa0cfd1ac..928a3a3ed1f 100644
--- a/TAO/tests/Bug_1383_Regression/Callee_i.h
+++ b/TAO/tests/Bug_1383_Regression/Callee_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CALLEE_I_H
#define CALLEE_I_H
diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
index 4b9cc99d591..98ae89f398b 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
index 267a6685937..6508fddf239 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/IORTable/IORTable.h"
#include "simple_i.h"
diff --git a/TAO/tests/Bug_1383_Regression/callee.idl b/TAO/tests/Bug_1383_Regression/callee.idl
index 3204a4444e6..17992673573 100644
--- a/TAO/tests/Bug_1383_Regression/callee.idl
+++ b/TAO/tests/Bug_1383_Regression/callee.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Callee {
void callback(in string message);
};
diff --git a/TAO/tests/Bug_1383_Regression/simple.idl b/TAO/tests/Bug_1383_Regression/simple.idl
index 0de9ac97255..c97396ec3b6 100644
--- a/TAO/tests/Bug_1383_Regression/simple.idl
+++ b/TAO/tests/Bug_1383_Regression/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_IDL
#define SIMPLE_IDL
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.cpp b/TAO/tests/Bug_1383_Regression/simple_i.cpp
index db619308dbc..f6a94dabbc0 100644
--- a/TAO/tests/Bug_1383_Regression/simple_i.cpp
+++ b/TAO/tests/Bug_1383_Regression/simple_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_i.h"
#include "tao/ORB_Core.h"
#include "ace/Reactor.h"
diff --git a/TAO/tests/Bug_1383_Regression/simple_i.h b/TAO/tests/Bug_1383_Regression/simple_i.h
index 4b253d48b7c..642ef9fbdbe 100644
--- a/TAO/tests/Bug_1383_Regression/simple_i.h
+++ b/TAO/tests/Bug_1383_Regression/simple_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_I_H
#define SIMPLE_I_H
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index 5dc0408c587..c0dcabfedc5 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index ae31215c43d..7960342ab5a 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
Sender_i::Sender_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index eb78e7d3824..0ceddb42d74 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index a62738e692f..225c932dd98 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "Server_Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc b/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
index 68795270a87..5c42696baa0 100644
--- a/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
+++ b/TAO/tests/Bug_1476_Test/Bug_1476_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoidldefaults, taoclient, messaging {
idlflags += -Sa -St
diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp
index f803832567c..c34bfb0fc68 100644
--- a/TAO/tests/Bug_1476_Test/client.cpp
+++ b/TAO/tests/Bug_1476_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
index 21caa76af8d..97f849245ea 100644
--- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
+++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 74d01c679a9..77f8f79a96f 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Reply_Handler.h"
Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index 3c9c25afd9b..b491aa754fe 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef REPLY_HANDLER_H
#define REPLY_HANDLER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index 771eb400b34..379eaa4830a 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 83582b0ecaa..2e968a42f69 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
index a1d2b35a529..fca7d1c653b 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index d1546f48035..404ff0d981b 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index 059bfe983b0..4bc7c2cbc34 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index 7e3683a231e..8a13ca2fcc9 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index 0ed4112568a..7d630044c0f 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = bug_1535_regression
Source_Files {
diff --git a/TAO/tests/Bug_1535_Regression/Test.idl b/TAO/tests/Bug_1535_Regression/Test.idl
index c3b752788a4..f8e700d10cb 100644
--- a/TAO/tests/Bug_1535_Regression/Test.idl
+++ b/TAO/tests/Bug_1535_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void print_hello_world();
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 9b31706698f..a0d3ff9494b 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test.h"
#include "tao/Utils/ORB_Destroyer.h"
#include "tao/Utils/RIR_Narrow.h"
diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
index 22cdec6aa4c..dfdeb10874f 100644
--- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
+++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index 9582472460d..3c2f6013b86 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
Client_Task::Client_Task (Test::Hello_ptr receiver,
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 55866f53bad..2885a6c62ff 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index fb626dd6af9..5da7ffbe20b 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reply_Handler.h"
Reply_Handler::Reply_Handler (
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index 40e406e3ece..69a1d3e7a49 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
index aad2d3ed710..15278346daf 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
index 3dc626dd384..1d1b217d8fb 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc b/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
index b0bd1069df5..82c8e7d6468 100644
--- a/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
+++ b/TAO/tests/Bug_1635_Regression/Bug_1635_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1635_Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_1636_Regression/test.mpc b/TAO/tests/Bug_1636_Regression/test.mpc
index 79a8483b3d4..786ece68c7a 100644
--- a/TAO/tests/Bug_1636_Regression/test.mpc
+++ b/TAO/tests/Bug_1636_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (bug_1636_testclient) : taoclient, dynamicany, dynamicinterface, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = client
diff --git a/TAO/tests/Bug_1639_Regression/test.mpc b/TAO/tests/Bug_1639_Regression/test.mpc
index 883fc1c4bd0..1dbcabd4b61 100644
--- a/TAO/tests/Bug_1639_Regression/test.mpc
+++ b/TAO/tests/Bug_1639_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Bug_1639_testclient) : taoserver, dynamicany {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index 1fe63298c85..37709fb765a 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, amh {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
index e2fbcdc3d00..18b170dbc93 100644
--- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
+++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 9aafb92d591..f4f86e89b64 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_1676_Regression/server.cpp
+++ b/TAO/tests/Bug_1676_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc b/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
index 8c4e0b18f2f..aee9f5b85f5 100644
--- a/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
+++ b/TAO/tests/Bug_1693_Test/Bug_1693_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, codecfactory {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index 9a44fb1bbee..bde40aa87ad 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
index 679a47c31c8..ffe19a68028 100644
--- a/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
+++ b/TAO/tests/Bug_1812_Regression/Bug_1812_Regession.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
diff --git a/TAO/tests/Bug_1812_Regression/Test.idl b/TAO/tests/Bug_1812_Regression/Test.idl
index 176f713989b..4584d1e22c8 100644
--- a/TAO/tests/Bug_1812_Regression/Test.idl
+++ b/TAO/tests/Bug_1812_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
local interface foo {
diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp
index f3c85fbb228..3073c4356d9 100644
--- a/TAO/tests/Bug_1812_Regression/test.cpp
+++ b/TAO/tests/Bug_1812_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
/**
diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
index 679a47c31c8..ffe19a68028 100644
--- a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
+++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl
index 2b47d41dd97..4f81d103bae 100644
--- a/TAO/tests/Bug_1813_Regression/Test.idl
+++ b/TAO/tests/Bug_1813_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
interface foo {
diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp
index f3c85fbb228..3073c4356d9 100644
--- a/TAO/tests/Bug_1813_Regression/test.cpp
+++ b/TAO/tests/Bug_1813_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
/**
diff --git a/TAO/tests/Bug_1869_Regression/AMI.idl b/TAO/tests/Bug_1869_Regression/AMI.idl
index d0c2a9eb238..c8baae20017 100644
--- a/TAO/tests/Bug_1869_Regression/AMI.idl
+++ b/TAO/tests/Bug_1869_Regression/AMI.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module AMI_test {
interface adder {
long add(in long a, in long b);
diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
index 43315056a45..a321a58bdb7 100644
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
AMI.idl
diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp
index 746e70955d5..e3282dc75c7 100644
--- a/TAO/tests/Bug_1869_Regression/client.cpp
+++ b/TAO/tests/Bug_1869_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMIS.h"
#include "ace/Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
index d62cba9c8ae..ec627ac1ee2 100644
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ b/TAO/tests/Bug_1869_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AMIS.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_1904_Regression/test.cpp b/TAO/tests/Bug_1904_Regression/test.cpp
index baf2e177689..2b1315f4c33 100644
--- a/TAO/tests/Bug_1904_Regression/test.cpp
+++ b/TAO/tests/Bug_1904_Regression/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testS.h"
class con_i : public virtual POA_con
diff --git a/TAO/tests/Bug_1904_Regression/test.idl b/TAO/tests/Bug_1904_Regression/test.idl
index 766591f6d84..a4f4b28ffe9 100644
--- a/TAO/tests/Bug_1904_Regression/test.idl
+++ b/TAO/tests/Bug_1904_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface con
{
};
diff --git a/TAO/tests/Bug_1904_Regression/test.mpc b/TAO/tests/Bug_1904_Regression/test.mpc
index 083ecf74e56..9e316812771 100644
--- a/TAO/tests/Bug_1904_Regression/test.mpc
+++ b/TAO/tests/Bug_1904_Regression/test.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project : taoserver {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc b/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
index b4263adaa64..4bc3a03d3f5 100644
--- a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
+++ b/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
exename = server
}
diff --git a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
index 2eae4fa635c..f3b953d440c 100644
--- a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
+++ b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "ace/Auto_Event.h"
diff --git a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
index b49013039ad..835cf607a3b 100644
--- a/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
+++ b/TAO/tests/Bug_2085_Regression/Bug_2085_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
}
diff --git a/TAO/tests/Bug_2119_Regression/test.idl b/TAO/tests/Bug_2119_Regression/test.idl
index d0cd1a1d262..2e3f1074ea6 100644
--- a/TAO/tests/Bug_2119_Regression/test.idl
+++ b/TAO/tests/Bug_2119_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype MyValueType;
typedef sequence<MyValueType> MyValueType_Seq;
diff --git a/TAO/tests/Bug_2119_Regression/test.mpc b/TAO/tests/Bug_2119_Regression/test.mpc
index 71c143f42b5..c24d186b5bc 100644
--- a/TAO/tests/Bug_2119_Regression/test.mpc
+++ b/TAO/tests/Bug_2119_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (tao67_test) : taolib_with_idl, valuetype, portableserver {
}
diff --git a/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc b/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
index 40b148c2a0d..2a9a1a294de 100644
--- a/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
+++ b/TAO/tests/Bug_2122_Regression/Bug_2122_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc b/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
index fa752d627cf..a9401f9075e 100644
--- a/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
+++ b/TAO/tests/Bug_2124_Regression/Bug_2124_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc b/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
index c0a8257f23e..3d2e3894433 100644
--- a/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
+++ b/TAO/tests/Bug_2126_Regression/Bug_2126_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
index 7ade436bd07..daa36d6dfe2 100644
--- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
+++ b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoserver, iortable, avoids_minimum_corba, messaging {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index 6a7abe0399e..8ffa2778c9c 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/IORTable/IORTable.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_2134_Regression/Hello.idl b/TAO/tests/Bug_2134_Regression/Hello.idl
index 44f72bfbfbe..a2ea951b440 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.idl
+++ b/TAO/tests/Bug_2134_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
void say_hello();
diff --git a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
index 3fcbdd9dee2..872b78f1085 100644
--- a/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
+++ b/TAO/tests/Bug_2144_Regression/Bug_2144_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Client) : taoclient, valuetype {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp
index e5f0c76b516..7d1a19fb791 100644
--- a/TAO/tests/Bug_2144_Regression/test.cpp
+++ b/TAO/tests/Bug_2144_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index 9a3a20707ae..af16a49e295 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index 803612e4698..7503bf4a719 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index a3187bb35a1..6558436e9de 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 99e084474fb..f2de8bdfec6 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index 41d5b8dfa81..4c20cc8475c 100644
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index ff81b60ec4f..de57df0556f 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index c0439be73f2..16f14a203b8 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
index efde33e3d93..f496b9b1291 100644
--- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
+++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index 8fcb5bc5025..c4a4c126fe1 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 9fa6d7173b3..a4f6a40317d 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc
index d9d85d6c1b8..2faaa3b3355 100644
--- a/TAO/tests/Bug_2188_Regression/broken.mpc
+++ b/TAO/tests/Bug_2188_Regression/broken.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
broken.idl
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 69d6e0d8854..760e604f85c 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "brokenC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 63ff34345e6..89110ffe8e5 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "broken_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc b/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
index 9130c21b40a..27c799bcf30 100644
--- a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
+++ b/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test): taoclient {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2201_Regression/TestData.idl b/TAO/tests/Bug_2201_Regression/TestData.idl
index 9c205e1df77..556e2442578 100644
--- a/TAO/tests/Bug_2201_Regression/TestData.idl
+++ b/TAO/tests/Bug_2201_Regression/TestData.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module SeqTest {
typedef sequence<long> LongSeq;
diff --git a/TAO/tests/Bug_2201_Regression/test.cpp b/TAO/tests/Bug_2201_Regression/test.cpp
index 1a11bb77036..f2b6a27116c 100644
--- a/TAO/tests/Bug_2201_Regression/test.cpp
+++ b/TAO/tests/Bug_2201_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "TestDataC.h"
diff --git a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
index cff84ebf492..ea9ece7c33c 100644
--- a/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
+++ b/TAO/tests/Bug_2222_Regression/Bug_2222_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*Test) : taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_2222_Regression/TestCase.idl b/TAO/tests/Bug_2222_Regression/TestCase.idl
index 119634fdc21..b96ecdff3de 100644
--- a/TAO/tests/Bug_2222_Regression/TestCase.idl
+++ b/TAO/tests/Bug_2222_Regression/TestCase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestType.idl"
typedef Array_Typedef Typedef_Of_Imported_Array_Typedef;
diff --git a/TAO/tests/Bug_2222_Regression/TestType.idl b/TAO/tests/Bug_2222_Regression/TestType.idl
index 408e5cf6d97..e27a0ed01cf 100644
--- a/TAO/tests/Bug_2222_Regression/TestType.idl
+++ b/TAO/tests/Bug_2222_Regression/TestType.idl
@@ -1,3 +1 @@
-// $Id$
-
typedef octet Array_Typedef[1];
diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp
index ee04b647ea8..a3e4da4a06c 100644
--- a/TAO/tests/Bug_2222_Regression/test.cpp
+++ b/TAO/tests/Bug_2222_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCaseC.h"
/**
diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
index 447b7f6dd43..f44af041529 100644
--- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults,anytypecode {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2234_Regression/Test.idl b/TAO/tests/Bug_2234_Regression/Test.idl
index 662cfb2e660..a6eab054a71 100644
--- a/TAO/tests/Bug_2234_Regression/Test.idl
+++ b/TAO/tests/Bug_2234_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
struct MyNonVarStruct {
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index f95bc266be0..f9c3cab03c4 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Regression test Bug 2234
//
// The bug manifests itself in the server.
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index fe3be5b95db..0fc3e0396fa 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Regression test Bug 2234
//
// The bug actually manifested itself in class AnInterceptor::receive_request()
diff --git a/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc b/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
index 9a975cb5ea0..32363bece8e 100644
--- a/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
+++ b/TAO/tests/Bug_2241_Regression/Bug_2241_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_2241_Regression): taoserver {
exename = Bug_2241_Regression
}
diff --git a/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc b/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
index f8ccf13a7d1..84ec0c4562a 100644
--- a/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
+++ b/TAO/tests/Bug_2243_Regression/Bug_2243_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = ORB_object_to_string
}
diff --git a/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp b/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
index 36f3a07098e..f3ed3df0aac 100644
--- a/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
+++ b/TAO/tests/Bug_2243_Regression/ORB_object_to_string.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Adapted by Jules Colding <colding@omesc.com>
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
index cf4dc3f81cb..efd048956a3 100644
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Gp -Gd
IDL_Files {
diff --git a/TAO/tests/Bug_2289_Regression/Test.idl b/TAO/tests/Bug_2289_Regression/Test.idl
index 0a599c8fbd3..50b7b89c052 100644
--- a/TAO/tests/Bug_2289_Regression/Test.idl
+++ b/TAO/tests/Bug_2289_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
typedef string MyString;
interface MyInterface
diff --git a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
index f362da7ae93..9301a9f3a21 100644
--- a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
+++ b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server) : taoserver, amh {
source_files {
server.cpp
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index bae965cb495..6cad968abdb 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -1,6 +1,4 @@
-// $Id$
-
#include "ace/Thread_Manager.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
index ccb8a89d9e4..56c23b5e96c 100644
--- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
+++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
index b27a1720817..725dc324134 100644
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ b/TAO/tests/Bug_2328_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
index 4aba483d812..563cd9dca61 100644
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ b/TAO/tests/Bug_2328_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
index 1f4dbfe25ff..0235de3816b 100644
--- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
+++ b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoserver, imr_client, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2345_Regression/server.cpp b/TAO/tests/Bug_2345_Regression/server.cpp
index 5dd67aa2b89..adc4efac59f 100644
--- a/TAO/tests/Bug_2345_Regression/server.cpp
+++ b/TAO/tests/Bug_2345_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
index 28055823491..75a3b397660 100644
--- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
+++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
foo.idl
diff --git a/TAO/tests/Bug_2349_Regression/client.cpp b/TAO/tests/Bug_2349_Regression/client.cpp
index 90635aa9cbe..539d859a897 100644
--- a/TAO/tests/Bug_2349_Regression/client.cpp
+++ b/TAO/tests/Bug_2349_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fooC.h"
#include "ace/Log_Msg.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2349_Regression/foo.idl b/TAO/tests/Bug_2349_Regression/foo.idl
index a31000cea9f..caa37232c75 100644
--- a/TAO/tests/Bug_2349_Regression/foo.idl
+++ b/TAO/tests/Bug_2349_Regression/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface foo
{
oneway void destroy ();
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index c55accbf497..6e3cfe0601c 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "fooS.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
index d56407ee1e2..a6e900e25e6 100644
--- a/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
+++ b/TAO/tests/Bug_2356_Regression/Bug_2356_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
index d428b0fce50..40c359df4de 100644
--- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
+++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Test) : taoserver, valuetype {
exename = test
Source_Files {
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
index 18e51e6d539..c7a97c174ca 100644
--- a/TAO/tests/Bug_2375_Regression/test.cpp
+++ b/TAO/tests/Bug_2375_Regression/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testC.h"
class MyTestValuetypeFactory : public TestValuetype_init {
public:
diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl
index a6ee7413825..e62c9b1ab34 100644
--- a/TAO/tests/Bug_2375_Regression/test.idl
+++ b/TAO/tests/Bug_2375_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
valuetype TestValuetype {
factory create(in boolean b, in short s);
};
diff --git a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
index 6397809c1be..a4dc937e8b4 100644
--- a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
+++ b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Test) : taoserver {
exename = test
idlflags += -t ./mytmp
diff --git a/TAO/tests/Bug_2399_Regression/included.idl b/TAO/tests/Bug_2399_Regression/included.idl
index ed8e9a102a1..6cda4c9e4b6 100644
--- a/TAO/tests/Bug_2399_Regression/included.idl
+++ b/TAO/tests/Bug_2399_Regression/included.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Parent
{
};
diff --git a/TAO/tests/Bug_2399_Regression/mytmp/included.idl b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
index df4a6fa7b06..fb71a2f27d8 100644
--- a/TAO/tests/Bug_2399_Regression/mytmp/included.idl
+++ b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
@@ -1,3 +1 @@
-// $Id$
-
This file should not be compiled at all.
diff --git a/TAO/tests/Bug_2399_Regression/test.cpp b/TAO/tests/Bug_2399_Regression/test.cpp
index 4b120707c8e..546f2de72db 100644
--- a/TAO/tests/Bug_2399_Regression/test.cpp
+++ b/TAO/tests/Bug_2399_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_2399_Regression/test.idl b/TAO/tests/Bug_2399_Regression/test.idl
index b0e1cbac672..72441bfb55a 100644
--- a/TAO/tests/Bug_2399_Regression/test.idl
+++ b/TAO/tests/Bug_2399_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "included.idl"
interface Child : Parent
diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
index 5d7caaa5af8..10f92238eb0 100644
--- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
+++ b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
publisher.idl
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index 03297e9cbb5..e1f24e78eb7 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber_impl.h"
#include "publisherC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2417_Regression/publisher.idl b/TAO/tests/Bug_2417_Regression/publisher.idl
index 094eead5519..cc69d1d1591 100644
--- a/TAO/tests/Bug_2417_Regression/publisher.idl
+++ b/TAO/tests/Bug_2417_Regression/publisher.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber.idl"
interface Publisher
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index add59e02a0f..edfd9b3a5c0 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "publisher_impl.h"
#include "ace/OS_NS_sys_time.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h
index e33169f5ad5..e13d41f0a32 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.h
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXPLOIT_PUBLISHER_IMPL_H
#define EXPLOIT_PUBLISHER_IMPL_H
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 2bd02da8c78..31b7f25a20a 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "publisher_impl.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_2417_Regression/subscriber.idl b/TAO/tests/Bug_2417_Regression/subscriber.idl
index 43da8cdcdc6..956a02c7213 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber.idl
+++ b/TAO/tests/Bug_2417_Regression/subscriber.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Subscriber
{
oneway void onData(in double value);
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
index 3f9d8c2101a..6d50931dbd6 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "subscriber_impl.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
index 94ec063bcf4..80bb73f5a8d 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EXPLOIT_PUBLISHER_IMPL_H
#define EXPLOIT_PUBLISHER_IMPL_H
diff --git a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc b/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
index 073f1f25679..0b02254e3b5 100644
--- a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
+++ b/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Client) : taoserver, messaging {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_2419_Regression/abstract_parent.idl b/TAO/tests/Bug_2419_Regression/abstract_parent.idl
index 84e5521f296..35f60b41aca 100644
--- a/TAO/tests/Bug_2419_Regression/abstract_parent.idl
+++ b/TAO/tests/Bug_2419_Regression/abstract_parent.idl
@@ -1,5 +1,3 @@
-// $Id$
-
abstract interface abstract_parent
{
void method (in abstract_parent aParent);
diff --git a/TAO/tests/Bug_2419_Regression/client.cpp b/TAO/tests/Bug_2419_Regression/client.cpp
index 9f668c8851a..4339812542b 100644
--- a/TAO/tests/Bug_2419_Regression/client.cpp
+++ b/TAO/tests/Bug_2419_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "local_childS.h"
int ACE_TMAIN (int, ACE_TCHAR*[])
diff --git a/TAO/tests/Bug_2419_Regression/local_child.idl b/TAO/tests/Bug_2419_Regression/local_child.idl
index f993399b138..1cbf65b629c 100644
--- a/TAO/tests/Bug_2419_Regression/local_child.idl
+++ b/TAO/tests/Bug_2419_Regression/local_child.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "abstract_parent.idl"
local interface local_child : abstract_parent
diff --git a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc b/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
index 72053dc671f..ab9275fd8da 100644
--- a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
+++ b/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
project (*Client) : taoserver {
exename = client
Source_Files {
diff --git a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl b/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
index 0e5d486d864..35cc3efd768 100644
--- a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
+++ b/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
@@ -1,2 +1 @@
-// $Id$
/** * CORBA Common Object Services: Naming Service. * <p> * The detailed specification is available from the * <a href="http://www.omg.org">Object Management Group</a>. * * @author OMG * @version Version 00-11-01 */ module CosNaming { typedef string Istring; struct NameComponent { Istring id; Istring kind; }; typedef sequence <NameComponent> Name; enum BindingType { nobject, ncontext }; struct Binding { Name binding_name; BindingType binding_type; }; typedef sequence <Binding> BindingList; interface BindingIterator; /** * The NamingContext interface provides operations which support the following: * <ul> * <li> binding objects * <li> name resolution * <li> unbinding * <li> creating naming contexts * <li> deleting contexts * <li> listing a naming context * </ul> */ interface NamingContext { enum NotFoundReason { missing_node, not_context, not_object }; /** * Indicates the name does not identify a binding. */ exception NotFound { NotFoundReason why; Name rest_of_name; }; /** * Indicates that the implementation has given up for some reason. The * client, however, may be able to continue the operation at the returned * naming context. */ exception CannotProceed { NamingContext cxt; Name rest_of_name; }; /** * Indicates the name is invalid. (A name of length 0 is invalid; * implementations may place other restrictions on names.) */ exception InvalidName {}; /** * Indicates an object is already bound to the specified name. Only one * object can be bound to a particular name in a context. */ exception AlreadyBound {}; /** * Indicates that a naming context has bindings. */ exception NotEmpty {}; /** * Creates a binding of a name and an object in the naming * context. Naming contexts that are bound using bind do not * participate in name resolution when compound names are passed to be * resolved. A bind operation that is passed a compound name is * defined as follows: * * <pre> * ctx->bind(< c1 ; c2 ; ... ; cn >, obj) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind(< cn >, obj) * </pre> * * @parm n - binding name. * @parm obj - object to bind. * @raises AlreadyBound - if the name is bound in the context. */ void bind (in Name n, in Object obj) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * Creates a binding of a name and an object in the naming context * even if the name is already bound in the context. Naming contexts * that are bound using rebind do not participate in name resolution * when compound names are passed to be resolved. * * @parm n - binding name. * @parm obj - object to bind. */ void rebind (in Name n, in Object obj) raises (NotFound, CannotProceed, InvalidName); /** * Names an object that is a naming context. Naming contexts that are * bound using bind_context() participate in name resolution when * compound names are passed to be resolved. A bind_context operation * that is passed a compound name is defined as follows: * <pre> * ctx->bind_context(< c1 ; c2 ; ... ; cn >, nc) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_context(< cn >, nc) * </pre> * * @parm n - binding name. * @parm nc - naming context to bind. * @raises AlreadyBound - if the name is bound in the context. */ void bind_context (in Name n, in NamingContext nc) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * Creates a binding of a name and a naming context in the naming * context even if the name is already bound in the context. Naming * contexts that are bound using rebind_context() participate in name * resolution when compound names are passed to be resolved. * * @parm n - binding name. * @parm nc - naming context to bind. */ void rebind_context (in Name n, in NamingContext nc) raises (NotFound, CannotProceed, InvalidName); /** * The resolve operation is the process of retrieving an object bound * to a name in a given context. The given name must exactly match the * bound name. The naming service does not return the type of the * object. Clients are responsible for "narrowing" the object to the * appropriate type. That is, clients typically cast the returned * object from Object to a more specialized interface. Names can have * multiple components; therefore, name resolution can traverse * multiple contexts. * A compound resolve is defined as follows: * <pre> * ctx->resolve(< c1 ; c2 ; ... ; cn >) := * ctx->resolve(< c1 ; c2 ; ... ; cn-1 >)->resolve(< cn >) * </pre> * * @parm n - binding name. * @returns bound object. */ Object resolve (in Name n) raises (NotFound, CannotProceed, InvalidName); /** * The unbind operation removes a name binding from a context. * A unbind operation that is passed a compound name is defined as follows: * <pre> * ctx->unbind(< c1 ; c2 ; ... ; cn >) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->unbind(< cn >) * </pre> * * @parm n - binding name. */ void unbind (in Name n) raises (NotFound, CannotProceed, InvalidName); /** * This operation returns a naming context implemented by the same * naming server as the context on which the operation was * invoked. The new context is not bound to any name. * * @returns new binding context. */ NamingContext new_context (); /** * This operation creates a new context and binds it to the name * supplied as an argument. The newly-created context is implemented * by the same naming server as the context in which it was bound * (that is, the naming server that implements the context denoted by * the name argument excluding the last component). A bind_new_context * that is passed a compound name is defined as follows: * * <pre> * ctx->bind_new_context(< c1 ; c2 ; ... ; cn >) := * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_new_context(< cn >) * </pre> * * @parm n - binding name. * @returns new binding context. * @raises AlreadyBound - if the name is bound in the context. */ NamingContext bind_new_context (in Name n) raises (NotFound, CannotProceed, InvalidName, AlreadyBound); /** * The destroy operation deletes a naming context. The list operation * allows a client to iterate through a set of bindings in a naming * context. * * @raises NotEmpty - if the naming context contains bindings. */ void destroy () raises (NotEmpty); /** * The list operation returns at most the requested number of bindings in * BindingList bl. * <ul> * <li> If the naming context contains additional bindings, the list * operation returns a BindingIterator with the additional bindings. * <li> If the naming context does not contain additional bindings, the * binding iterator is a nil object reference. * </ul> * * @parm how_many - maximum number of binding to return in bl. * @parm bl - list of bindings. * @parm bi - iterator over remaining bindings. */ void list (in unsigned long how_many, out BindingList bl, out BindingIterator bi); }; /** * The BindingIterator interface allows a client to iterate through the * bindings using the next_one or next_n operations. */ interface BindingIterator { /** * This operation returns the next binding. If there are no more * bindings, false is returned. * * @parm b - next binding. */ boolean next_one (out Binding b); /** * This operation returns at most the requested number of bindings. * * @parm how_many - maximum number of binding to return in bl. * @parm bl - list of bindings. */ boolean next_n (in unsigned long how_many, out BindingList bl); /** * This operation destroys the iterator. */ void destroy (); }; /** * The NamingContextExt Interface provides the extensions to the * NamingContext Interface as proposed by the Interoperable * Naming Service Extension. */ interface NamingContextExt: NamingContext { typedef string StringName; typedef string Address; typedef string URLString; /** * This operation accepts a Name and returns a stringified Name. * * @param n - Name (a sequence of NameComponents) * @raises InvalidName - if the Name is invalid. */ StringName to_string (in Name n) raises (InvalidName); /** * This operation accepts a StringifiedName and returns a Name. * * @param n - a StringifiedName * @raises InvalidName - if the Name is invalid. */ Name to_name (in StringName sn) raises (InvalidName); /** * Indicates a syntactically invalid address component. */ exception InvalidAddress {}; /** * This operation accepts a URL address component and a stringified * name and returns a URL string. * * @param n - a Stringified name. * @raises addr - URL address component. */ URLString to_url (in Address addr, in StringName sn) raises (InvalidAddress, InvalidName); /** * This is a convenience operation that performs a resolve in the same * manner as NamingContext::resolve. * * @param n - a Stringified name. * @raises NotFound, CannotProceed, InvalidName */ Object resolve_str (in StringName n) raises (NotFound, CannotProceed, InvalidName); }; };
diff --git a/TAO/tests/Bug_2424_Regression/client.cpp b/TAO/tests/Bug_2424_Regression/client.cpp
index 10eebeb1eb9..dbe7118adda 100644
--- a/TAO/tests/Bug_2424_Regression/client.cpp
+++ b/TAO/tests/Bug_2424_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "OneLineCosNamingC.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
index fcc7a879916..27c6a44f57c 100644
--- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
+++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GC
diff --git a/TAO/tests/Bug_2429_Regression/Child.idl b/TAO/tests/Bug_2429_Regression/Child.idl
index 166b36367ce..2a88b204f66 100644
--- a/TAO/tests/Bug_2429_Regression/Child.idl
+++ b/TAO/tests/Bug_2429_Regression/Child.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Parent.idl"
interface Child : Parent
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
index 9f81ba41932..79dfb73892a 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ChildServant.h"
ChildServant::ChildServant(CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.h b/TAO/tests/Bug_2429_Regression/ChildServant.h
index cb342276e15..f2d715469c2 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.h
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.h
@@ -1,8 +1,6 @@
#ifndef CHILDSERVANT_H
#define CHILDSERVANT_H
-// $Id$
-
#include "ChildS.h"
class ChildServant
diff --git a/TAO/tests/Bug_2429_Regression/Parent.idl b/TAO/tests/Bug_2429_Regression/Parent.idl
index b142f1939e3..5858f4f4b6a 100644
--- a/TAO/tests/Bug_2429_Regression/Parent.idl
+++ b/TAO/tests/Bug_2429_Regression/Parent.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Parent
{
void parentMethod ();
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 7f321c20ad3..7614508edcf 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
#include "ChildS.h"
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index 458a4d71d89..6e11d72ad09 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ChildServant.h"
diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
index a4f043c20bb..aeed3e795f6 100644
--- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
+++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -St
IDL_Files {
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index daa8567c012..31ee3c945c9 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 025249e75ce..6f7b23da911 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp
index c370bf97cf4..ce913dc160a 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2494_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2494_Regression/test_i.h b/TAO/tests/Bug_2494_Regression/test_i.h
index 8eb1d8efcf6..6bce3d1b74e 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.h
+++ b/TAO/tests/Bug_2494_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BUG_2494_REGRESSION_TEST_I_H
#define TAO_BUG_2494_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_2494_Regression/test_i.inl b/TAO/tests/Bug_2494_Regression/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Bug_2494_Regression/test_i.inl
+++ b/TAO/tests/Bug_2494_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
index 1ad7419dbfd..172e1fcc66f 100644
--- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
+++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2503_Regression/Test.idl b/TAO/tests/Bug_2503_Regression/Test.idl
index f1988af976b..7af43ccd617 100644
--- a/TAO/tests/Bug_2503_Regression/Test.idl
+++ b/TAO/tests/Bug_2503_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void the_operation(out long x);
diff --git a/TAO/tests/Bug_2503_Regression/client.cpp b/TAO/tests/Bug_2503_Regression/client.cpp
index 7d5423d2d45..ffddfc6886a 100644
--- a/TAO/tests/Bug_2503_Regression/client.cpp
+++ b/TAO/tests/Bug_2503_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2503_Regression/common.cpp b/TAO/tests/Bug_2503_Regression/common.cpp
index dba8d69b2c8..feb71ac0c42 100644
--- a/TAO/tests/Bug_2503_Regression/common.cpp
+++ b/TAO/tests/Bug_2503_Regression/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tests/Bug_2503_Regression/common.h b/TAO/tests/Bug_2503_Regression/common.h
index 923e7825b38..f1d22098419 100644
--- a/TAO/tests/Bug_2503_Regression/common.h
+++ b/TAO/tests/Bug_2503_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef common_h
#define common_h
diff --git a/TAO/tests/Bug_2503_Regression/server.cpp b/TAO/tests/Bug_2503_Regression/server.cpp
index b9e0a86cdf3..81c8557b8d6 100644
--- a/TAO/tests/Bug_2503_Regression/server.cpp
+++ b/TAO/tests/Bug_2503_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp
index 945fd5c627d..bcfdff9816f 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2503_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::
diff --git a/TAO/tests/Bug_2503_Regression/test_i.h b/TAO/tests/Bug_2503_Regression/test_i.h
index 9d5efcf6562..d4d4131ed76 100644
--- a/TAO/tests/Bug_2503_Regression/test_i.h
+++ b/TAO/tests/Bug_2503_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef test_i_h
#define test_i_h
diff --git a/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc b/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
index 5c0d4c58398..2ccc243f4f6 100644
--- a/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
+++ b/TAO/tests/Bug_2542_Regression/Bug_2542_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient, anytypecode, codecfactory, valuetype {
Source_Files {
bug_2542_regression.cpp
diff --git a/TAO/tests/Bug_2542_Regression/Test.idl b/TAO/tests/Bug_2542_Regression/Test.idl
index fbb96883a37..209514f3740 100644
--- a/TAO/tests/Bug_2542_Regression/Test.idl
+++ b/TAO/tests/Bug_2542_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype LongValue long;
valuetype Value
diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
index d2fcbfe587b..7ade799ab81 100644
--- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc b/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
index be2c40753b0..99c6402ef8d 100644
--- a/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
+++ b/TAO/tests/Bug_2543_Regression/Bug_2543_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient, anytypecode, codecfactory, valuetype {
Source_Files {
bug_2543_regression.cpp
diff --git a/TAO/tests/Bug_2543_Regression/Test.idl b/TAO/tests/Bug_2543_Regression/Test.idl
index ac8ac65cbcf..3a15374208e 100644
--- a/TAO/tests/Bug_2543_Regression/Test.idl
+++ b/TAO/tests/Bug_2543_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Base
{
public long l;
diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
index d72aecd3ac8..c2535b1c46d 100644
--- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc b/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
index 29aca4c4f5d..ff4b9d5bc98 100644
--- a/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
+++ b/TAO/tests/Bug_2549_Regression/Bug_2549_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, rtcorba, objreftemplate, rtscheduling, rtportableserver {
exename = test
diff --git a/TAO/tests/Bug_2549_Regression/test.cpp b/TAO/tests/Bug_2549_Regression/test.cpp
index 759c2d5edc9..8b471079b63 100644
--- a/TAO/tests/Bug_2549_Regression/test.cpp
+++ b/TAO/tests/Bug_2549_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_2549_Regression/test.idl b/TAO/tests/Bug_2549_Regression/test.idl
index f727112c408..7d9e96c8004 100644
--- a/TAO/tests/Bug_2549_Regression/test.idl
+++ b/TAO/tests/Bug_2549_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/PortableServer_include.pidl"
#include "tao/CodecFactory/IOP_Codec_include.pidl"
#include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl"
diff --git a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
index 31a88d65d5e..7021cc11b9c 100644
--- a/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
+++ b/TAO/tests/Bug_2560_Regression/Bug_2560_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Quoter.idl
diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
index 8b35bf371a2..5d1204a53f8 100644
--- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
+++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp
index abaed430dc8..144fb6910b1 100644
--- a/TAO/tests/Bug_2593_Regression/client.cpp
+++ b/TAO/tests/Bug_2593_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp
index f2dc09ae2f2..ec51b6fbc2f 100644
--- a/TAO/tests/Bug_2593_Regression/server.cpp
+++ b/TAO/tests/Bug_2593_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
index 2e4131f6280..fc2a86b7fe3 100644
--- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
+++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index 0d2a3e9e825..1ed1cca0704 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
index a5f7eea18ad..cf26f465d0a 100644
--- a/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
+++ b/TAO/tests/Bug_2654_Regression/Bug_2654_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Hello.idl
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index 8416cdb76c7..a60a9b3d8fd 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index 2efb6c22796..d71aff730df 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HELLO_H
#define HELLO_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Bug_2654_Regression/Hello.idl b/TAO/tests/Bug_2654_Regression/Hello.idl
index 6bd78c2cf25..10b5c220923 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.idl
+++ b/TAO/tests/Bug_2654_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 4897496b35f..b01a90b4eee 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloS.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index 8f6f117b63a..ea5b34d568f 100644
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ b/TAO/tests/Bug_2654_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
index 0cafec5b7d4..3ad0cfdb476 100644
--- a/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
+++ b/TAO/tests/Bug_2669_Regression/Bug_2669_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, ami {
exename = client
diff --git a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
index 52c83ae040b..766ce29f849 100644
--- a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
+++ b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 776222e727c..af994858e84 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index 5ced914b6ff..d72946c0d96 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h b/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
index bf76590f113..d159c0e4055 100644
--- a/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
+++ b/TAO/tests/Bug_2677_Regression/bug_2677_regression_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_2677_regression
// ------------------------------
diff --git a/TAO/tests/Bug_2677_Regression/server.cpp b/TAO/tests/Bug_2677_Regression/server.cpp
index b2554023954..5d1d275fcf1 100644
--- a/TAO/tests/Bug_2677_Regression/server.cpp
+++ b/TAO/tests/Bug_2677_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc b/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
index 45826f5e7cc..51cb7e747b5 100644
--- a/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
+++ b/TAO/tests/Bug_2678_Regression/Bug_2678_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
IDL_Files {
diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp
index 679f5bf277b..6e054852575 100644
--- a/TAO/tests/Bug_2678_Regression/client.cpp
+++ b/TAO/tests/Bug_2678_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index 7ed73de53f4..831a0c643b5 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior");
diff --git a/TAO/tests/Bug_2678_Regression/test.idl b/TAO/tests/Bug_2678_Regression/test.idl
index a77a7bcdcce..4113885f698 100644
--- a/TAO/tests/Bug_2678_Regression/test.idl
+++ b/TAO/tests/Bug_2678_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
typedef sequence<any> AnySeq;
struct Container
diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc
index bd207aa6449..4cc2d1a60b6 100644
--- a/TAO/tests/Bug_2683_Regression/IORTable.mpc
+++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index eb79402810e..f14e73c7679 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index 0a8c9f27da5..a6104342c1c 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
index 2bf8fe9f8e2..b85af0f2652 100644
--- a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
+++ b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GA
IDL_Files {
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
index fc2e03c93f0..a25657527a3 100644
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ b/TAO/tests/Bug_2702_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc b/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
index 0c95ddf25e6..99ff723e7e1 100644
--- a/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
+++ b/TAO/tests/Bug_2734_Regression/Bug_2734_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_2734_Regression/client.cpp b/TAO/tests/Bug_2734_Regression/client.cpp
index 22c22bab1d5..bbcf55171e2 100644
--- a/TAO/tests/Bug_2734_Regression/client.cpp
+++ b/TAO/tests/Bug_2734_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_2734_Regression/server.cpp b/TAO/tests/Bug_2734_Regression/server.cpp
index 1e66973cff6..b592a4416c9 100644
--- a/TAO/tests/Bug_2734_Regression/server.cpp
+++ b/TAO/tests/Bug_2734_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp
index 4dec77755fe..829ad2298e3 100644
--- a/TAO/tests/Bug_2734_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2734_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc b/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
+++ b/TAO/tests/Bug_2735_Regression/Bug_2735_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/Bug_2735_Regression/server.cpp b/TAO/tests/Bug_2735_Regression/server.cpp
index 4aa36e4d73c..d0b5d1c4b26 100644
--- a/TAO/tests/Bug_2735_Regression/server.cpp
+++ b/TAO/tests/Bug_2735_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc b/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
index a1ccf1cb049..18422a19b48 100644
--- a/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
+++ b/TAO/tests/Bug_2768_Regression/Bug_2768_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
index 2c827e18cb6..ba5ee68a0d4 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index 1178f378987..de582704c66 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __MESSENGER_I_H__
#define __MESSENGER_I_H__
diff --git a/TAO/tests/Bug_2768_Regression/client.cpp b/TAO/tests/Bug_2768_Regression/client.cpp
index 759923e4f4b..52f86afe50f 100644
--- a/TAO/tests/Bug_2768_Regression/client.cpp
+++ b/TAO/tests/Bug_2768_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_2768_Regression/server.cpp b/TAO/tests/Bug_2768_Regression/server.cpp
index eaed5c2e0f1..abb88e86bc9 100644
--- a/TAO/tests/Bug_2768_Regression/server.cpp
+++ b/TAO/tests/Bug_2768_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
#include "Messenger_i.h"
diff --git a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
index bb05329bc43..8e9365f5eb3 100755
--- a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
+++ b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*client) : taoclient, valuetype {
diff --git a/TAO/tests/Bug_2791_Regression/Message.idl b/TAO/tests/Bug_2791_Regression/Message.idl
index 0afd8fb1f25..9333b79c3f4 100755
--- a/TAO/tests/Bug_2791_Regression/Message.idl
+++ b/TAO/tests/Bug_2791_Regression/Message.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Message
{
private string user_;
diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
index 742028a19f9..6ad81e07eef 100755
--- a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
+++ b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageFactory.h"
diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.h b/TAO/tests/Bug_2791_Regression/MessageFactory.h
index 5b4b9ceeb3a..f2d862c99eb 100755
--- a/TAO/tests/Bug_2791_Regression/MessageFactory.h
+++ b/TAO/tests/Bug_2791_Regression/MessageFactory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Valuetype/ValueFactory.h"
#include "Message_i.h"
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp
index cfd2c57b632..2a1af32e41a 100755
--- a/TAO/tests/Bug_2791_Regression/Message_i.cpp
+++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Message_i.h"
MessageImpl::MessageImpl ()
diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h
index 6b4c1b744e7..ecf5ed5958b 100755
--- a/TAO/tests/Bug_2791_Regression/Message_i.h
+++ b/TAO/tests/Bug_2791_Regression/Message_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageC.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_2791_Regression/client.cpp b/TAO/tests/Bug_2791_Regression/client.cpp
index 147a13a7eb8..016f71f13d1 100755
--- a/TAO/tests/Bug_2791_Regression/client.cpp
+++ b/TAO/tests/Bug_2791_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageFactory.h"
#include "MessageC.h"
diff --git a/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
index 8336a76d8bf..7b48d34571e 100644
--- a/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
+++ b/TAO/tests/Bug_2792_Regression/Bug_2792_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
diff --git a/TAO/tests/Bug_2792_Regression/client.cpp b/TAO/tests/Bug_2792_Regression/client.cpp
index 087c31ecc6d..d57175ee309 100644
--- a/TAO/tests/Bug_2792_Regression/client.cpp
+++ b/TAO/tests/Bug_2792_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
index 8336a76d8bf..7b48d34571e 100644
--- a/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
+++ b/TAO/tests/Bug_2795_Regression/Bug_2795_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
diff --git a/TAO/tests/Bug_2795_Regression/client.cpp b/TAO/tests/Bug_2795_Regression/client.cpp
index 3a76a108054..d7dd902e7b9 100644
--- a/TAO/tests/Bug_2795_Regression/client.cpp
+++ b/TAO/tests/Bug_2795_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2804_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2804_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp
index 1fbc7867687..17bfc4b33e1 100644
--- a/TAO/tests/Bug_2804_Regression/client.cpp
+++ b/TAO/tests/Bug_2804_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2804_Regression/server.cpp b/TAO/tests/Bug_2804_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2804_Regression/server.cpp
+++ b/TAO/tests/Bug_2804_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc b/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
index f83271a8973..977092b1202 100644
--- a/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
+++ b/TAO/tests/Bug_2805_Regression/Bug_2805_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
+++ b/TAO/tests/Bug_2809_Regression/Bug_2809_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_2809_Regression/server.cpp b/TAO/tests/Bug_2809_Regression/server.cpp
index a7f56b9b742..dd58630657d 100644
--- a/TAO/tests/Bug_2809_Regression/server.cpp
+++ b/TAO/tests/Bug_2809_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
index 7343f17d4f5..cf13b69869f 100644
--- a/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
+++ b/TAO/tests/Bug_2826_Regression/Bug_2826_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
Source_Files {
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 05d902509df..4d2a19ed788 100644
--- a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/PortableServer/PortableServer.h"
#include "fooS.h"
diff --git a/TAO/tests/Bug_2826_Regression/foo.idl b/TAO/tests/Bug_2826_Regression/foo.idl
index 7ad6dd968c5..1b939b3f223 100644
--- a/TAO/tests/Bug_2826_Regression/foo.idl
+++ b/TAO/tests/Bug_2826_Regression/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface foo
{
void check();
diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2844_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2844_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index a3e741e3c9e..831bf9b524c 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2844_Regression/server.cpp
+++ b/TAO/tests/Bug_2844_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc b/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
index e9fa8a23ed9..843dce03b63 100644
--- a/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
+++ b/TAO/tests/Bug_2869_Regression/Bug_2869_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_2869_Regression/client.cpp b/TAO/tests/Bug_2869_Regression/client.cpp
index 290592ff2d7..a9d1a287987 100644
--- a/TAO/tests/Bug_2869_Regression/client.cpp
+++ b/TAO/tests/Bug_2869_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc b/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
index f83271a8973..977092b1202 100644
--- a/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
+++ b/TAO/tests/Bug_2909_Regression/Bug_2909_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_2918_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2918_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2918_Regression/Test.idl b/TAO/tests/Bug_2918_Regression/Test.idl
index c5c14ed184f..c0c84fc0ab1 100644
--- a/TAO/tests/Bug_2918_Regression/Test.idl
+++ b/TAO/tests/Bug_2918_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
typedef long FooType;
diff --git a/TAO/tests/Bug_2918_Regression/client.cpp b/TAO/tests/Bug_2918_Regression/client.cpp
index cc5dc2a72dd..537634be028 100644
--- a/TAO/tests/Bug_2918_Regression/client.cpp
+++ b/TAO/tests/Bug_2918_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_2918_Regression/server.cpp b/TAO/tests/Bug_2918_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_2918_Regression/server.cpp
+++ b/TAO/tests/Bug_2918_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc b/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
index 7bd12e6a2ef..73998a14a95 100644
--- a/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
+++ b/TAO/tests/Bug_2935_Regression/Bug_2935_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
ThreeTier.idl
diff --git a/TAO/tests/Bug_2935_Regression/ThreeTier.idl b/TAO/tests/Bug_2935_Regression/ThreeTier.idl
index 1bb4cf44f78..f7d2c19f453 100644
--- a/TAO/tests/Bug_2935_Regression/ThreeTier.idl
+++ b/TAO/tests/Bug_2935_Regression/ThreeTier.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
interface ThreeTier
{
/// record the occurrence of a tick
diff --git a/TAO/tests/Bug_2935_Regression/middle.cpp b/TAO/tests/Bug_2935_Regression/middle.cpp
index 24e47f8f98a..0ca31fd3a57 100644
--- a/TAO/tests/Bug_2935_Regression/middle.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "middle_i.h"
const ACE_TCHAR * ior_output_file = 0;
diff --git a/TAO/tests/Bug_2935_Regression/middle_i.cpp b/TAO/tests/Bug_2935_Regression/middle_i.cpp
index 64e42e26d61..ee83ce76838 100644
--- a/TAO/tests/Bug_2935_Regression/middle_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/middle_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "middle_i.h"
#include "ace/OS_NS_time.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_2935_Regression/sink.cpp b/TAO/tests/Bug_2935_Regression/sink.cpp
index 769d91eeb79..fa13971ef3f 100644
--- a/TAO/tests/Bug_2935_Regression/sink.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "sink_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2935_Regression/sink_i.cpp b/TAO/tests/Bug_2935_Regression/sink_i.cpp
index 02411772fb6..d55143af170 100644
--- a/TAO/tests/Bug_2935_Regression/sink_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/sink_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sink_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2936_Regression/DllORB.cpp b/TAO/tests/Bug_2936_Regression/DllORB.cpp
index 4abd4b6e9ca..156b5869e53 100644
--- a/TAO/tests/Bug_2936_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2936_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/tests/Bug_2936_Regression/DllORB.h b/TAO/tests/Bug_2936_Regression/DllORB.h
index 94bace9f3c1..9b3ae488bfb 100644
--- a/TAO/tests/Bug_2936_Regression/DllORB.h
+++ b/TAO/tests/Bug_2936_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
index 36a85c50435..239a115680c 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef PersistentPoa_h
#define PersistentPoa_h
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp
index bd982c6a498..1223e7c0876 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.cpp
+++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.mpc b/TAO/tests/Bug_2936_Regression/bug2936.mpc
index 7af13ef60af..0c2ea8f86b6 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.mpc
+++ b/TAO/tests/Bug_2936_Regression/bug2936.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (bug2936-exe): aceexe {
exename=server
Source_Files {
diff --git a/TAO/tests/Bug_2936_Regression/bug2936_export.h b/TAO/tests/Bug_2936_Regression/bug2936_export.h
index 10581a4e587..4cb8b2e2463 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936_export.h
+++ b/TAO/tests/Bug_2936_Regression/bug2936_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug2936
// ------------------------------
diff --git a/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc b/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
index 947ec4347ba..705c461b44c 100644
--- a/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
+++ b/TAO/tests/Bug_2953_Regression/Bug_2953_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2953_Regression/client.cpp b/TAO/tests/Bug_2953_Regression/client.cpp
index 191196967d4..97767d80a2a 100644
--- a/TAO/tests/Bug_2953_Regression/client.cpp
+++ b/TAO/tests/Bug_2953_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp
index 92e3b2d1ee7..0c7ac2eb322 100644
--- a/TAO/tests/Bug_2953_Regression/server.cpp
+++ b/TAO/tests/Bug_2953_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc b/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
index 67b7539e43c..de4381c7b1e 100644
--- a/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
+++ b/TAO/tests/Bug_2966_Regression/Bug_2966_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, dynamicinterface, avoids_minimum_corba {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp
index ec53524c2f8..2c55eb798a9 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2966_Regression/Hello.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_2966_Regression/client.cpp b/TAO/tests/Bug_2966_Regression/client.cpp
index 4327c459b67..fb97109232c 100644
--- a/TAO/tests/Bug_2966_Regression/client.cpp
+++ b/TAO/tests/Bug_2966_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/DII_CORBA_methods.h"
#include "TestC.h"
diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp
index 4f70fadd052..4f2e61f69b7 100644
--- a/TAO/tests/Bug_2966_Regression/server.cpp
+++ b/TAO/tests/Bug_2966_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc b/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
index 2bd74f5ef3a..29dfafe71c2 100644
--- a/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
+++ b/TAO/tests/Bug_3000_Regression/Bug_3000_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3000_Regression/client.cpp b/TAO/tests/Bug_3000_Regression/client.cpp
index 1ae58f54545..27d150fe725 100644
--- a/TAO/tests/Bug_3000_Regression/client.cpp
+++ b/TAO/tests/Bug_3000_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3000_Regression/server.cpp b/TAO/tests/Bug_3000_Regression/server.cpp
index 173ceb780e0..ae8f1ce7f4f 100644
--- a/TAO/tests/Bug_3000_Regression/server.cpp
+++ b/TAO/tests/Bug_3000_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc b/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
index aa31e54e848..5d63c9b2bfd 100644
--- a/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
+++ b/TAO/tests/Bug_3042_Regression/Bug_3042_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
}
diff --git a/TAO/tests/Bug_3042_Regression/client.cpp b/TAO/tests/Bug_3042_Regression/client.cpp
index 857ee60a427..dd7872e3077 100644
--- a/TAO/tests/Bug_3042_Regression/client.cpp
+++ b/TAO/tests/Bug_3042_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
index 98bf591d37f..12e909a54c5 100644
--- a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
+++ b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver, messaging, bidir_giop, threads {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp
index a00540167de..b0d9694d276 100644
--- a/TAO/tests/Bug_3068_Regression/client.cpp
+++ b/TAO/tests/Bug_3068_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp
index 7ece9eb1aef..d4a2360714f 100644
--- a/TAO/tests/Bug_3068_Regression/server.cpp
+++ b/TAO/tests/Bug_3068_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Bug_3068_Regression/test_i.cpp b/TAO/tests/Bug_3068_Regression/test_i.cpp
index 896f63ff15a..a493c19223a 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3068_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3068_Regression/test_i.inl b/TAO/tests/Bug_3068_Regression/test_i.inl
index c53124309f7..99c25e480f0 100644
--- a/TAO/tests/Bug_3068_Regression/test_i.inl
+++ b/TAO/tests/Bug_3068_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc b/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
index 5182de85749..0be06a7f217 100644
--- a/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
+++ b/TAO/tests/Bug_3108_Regression/Bug_3108_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp
index 51c34104576..259e7b0df70 100644
--- a/TAO/tests/Bug_3108_Regression/client.cpp
+++ b/TAO/tests/Bug_3108_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3108_Regression/server.cpp b/TAO/tests/Bug_3108_Regression/server.cpp
index 05b6a2fd0bb..1e735fe9441 100644
--- a/TAO/tests/Bug_3108_Regression/server.cpp
+++ b/TAO/tests/Bug_3108_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3108_Regression/test.idl b/TAO/tests/Bug_3108_Regression/test.idl
index 963e0c8a6a8..16420dedae1 100644
--- a/TAO/tests/Bug_3108_Regression/test.idl
+++ b/TAO/tests/Bug_3108_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
long test_method();
diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp
index bfe7394f5ab..c6a8e7bc541 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3108_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3108_Regression/test_i.h b/TAO/tests/Bug_3108_Regression/test_i.h
index 8191f1adbcc..a81166bf3e3 100644
--- a/TAO/tests/Bug_3108_Regression/test_i.h
+++ b/TAO/tests/Bug_3108_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_I_HH
#define TEST_I_HH
#include "testS.h"
diff --git a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
index 7d051f9e877..ec1a43547ca 100644
--- a/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
+++ b/TAO/tests/Bug_3154_Regression/orbsvcs/CosNotification.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* @file CosNotification.idl
*
diff --git a/TAO/tests/Bug_3154_Regression/test.idl b/TAO/tests/Bug_3154_Regression/test.idl
index 6534517b2cd..184d66052bb 100644
--- a/TAO/tests/Bug_3154_Regression/test.idl
+++ b/TAO/tests/Bug_3154_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// The next include is TAO specific.
#include "orbsvcs/FT_CORBA_ORB.idl"
diff --git a/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc b/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
index 6b3e52a0182..264845400f8 100644
--- a/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
+++ b/TAO/tests/Bug_3163_Regression/Bug_3163_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3163_Regression/client.cpp b/TAO/tests/Bug_3163_Regression/client.cpp
index 86471b52f52..8e9f4f0d3b9 100644
--- a/TAO/tests/Bug_3163_Regression/client.cpp
+++ b/TAO/tests/Bug_3163_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp
index e3f2f63cbbb..12a05b1cff3 100644
--- a/TAO/tests/Bug_3163_Regression/server.cpp
+++ b/TAO/tests/Bug_3163_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "tao/PortableServer/PortableServer.h"
#include "testS.h"
diff --git a/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc b/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
index ae45ad8aea9..718777ce03e 100644
--- a/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
+++ b/TAO/tests/Bug_3171_Regression/Bug_3171_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, valuetype, messaging, utils, threads {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 39bbbf250ac..de783b96f62 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc b/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
index 8f8341be456..e2ff19e1d9e 100644
--- a/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
+++ b/TAO/tests/Bug_3198_Regression/Bug_3198_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
bug_3198_regression.cpp
diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
index 5579022048c..b4c93c1b20b 100644
--- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
+++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/SystemException.h"
#include "tao/PolicyC.h"
diff --git a/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc b/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
index 7a3e773781c..d25ece3d615 100644
--- a/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
+++ b/TAO/tests/Bug_3251_Regression/Bug_3251_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server) : taoserver, threads {
after += *lib
Source_Files {
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
index b21f30a9b7b..3b52249e2b1 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h
index f8fe24bfba8..a9541c0f930 100644
--- a/TAO/tests/Bug_3251_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3251_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3251_DllORB_h
#define bug_3251_DllORB_h
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
index 4e12af4d05e..fa78847117a 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Arg_Shifter.h"
#include "tao/PortableServer/POAManager.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
index 0935d037b3a..964b95fc886 100644
--- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h
+++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3251_PersistentPoa_h
#define bug_3251_PersistentPoa_h
diff --git a/TAO/tests/Bug_3251_Regression/bug_3251_export.h b/TAO/tests/Bug_3251_Regression/bug_3251_export.h
index 55e3d892fab..3ae2ec6fa1a 100644
--- a/TAO/tests/Bug_3251_Regression/bug_3251_export.h
+++ b/TAO/tests/Bug_3251_Regression/bug_3251_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3251
// ------------------------------
diff --git a/TAO/tests/Bug_3251_Regression/server.cpp b/TAO/tests/Bug_3251_Regression/server.cpp
index 42e582784a2..e8fc3c46a43 100644
--- a/TAO/tests/Bug_3251_Regression/server.cpp
+++ b/TAO/tests/Bug_3251_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Reactor.h"
#include "ace/Signal.h"
diff --git a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
index 92565612bf4..d592ca7078b 100644
--- a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
+++ b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
index 697deb9ea8f..3b498551758 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Locator.h"
#include "ace/Log_Msg.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.h b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
index 9884f406281..dfd12fc855f 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.h
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVANT_LOCATOR_H_
#define _SERVANT_LOCATOR_H_
diff --git a/TAO/tests/Bug_3276_Regression/client.cpp b/TAO/tests/Bug_3276_Regression/client.cpp
index 53ff00e0127..59412b4da37 100644
--- a/TAO/tests/Bug_3276_Regression/client.cpp
+++ b/TAO/tests/Bug_3276_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SString.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3276_Regression/test_i.cpp b/TAO/tests/Bug_3276_Regression/test_i.cpp
index adfc0cca40e..0783dca44a9 100644
--- a/TAO/tests/Bug_3276_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3276_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3276_Regression/test_i.h b/TAO/tests/Bug_3276_Regression/test_i.h
index b301f1f6945..9632f4da048 100644
--- a/TAO/tests/Bug_3276_Regression/test_i.h
+++ b/TAO/tests/Bug_3276_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_I_H_
#define _TEST_I_H_
diff --git a/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc b/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
index 0b23fc42f14..90b09e158c0 100644
--- a/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
+++ b/TAO/tests/Bug_3299_Regression/Bug_3299_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp
index 737e84edc88..08a66f4eb2b 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3299_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3299_Regression/client.cpp b/TAO/tests/Bug_3299_Regression/client.cpp
index 3ddc90434e9..0f6d624f981 100644
--- a/TAO/tests/Bug_3299_Regression/client.cpp
+++ b/TAO/tests/Bug_3299_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3299_Regression/server.cpp b/TAO/tests/Bug_3299_Regression/server.cpp
index 5ff6ccea575..a29e11b9700 100644
--- a/TAO/tests/Bug_3299_Regression/server.cpp
+++ b/TAO/tests/Bug_3299_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc b/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
index bfe0e4b0ca1..2436f7d766a 100644
--- a/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
+++ b/TAO/tests/Bug_3311_Regression/Bug_3311_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver {
exename = test
diff --git a/TAO/tests/Bug_3311_Regression/test.cpp b/TAO/tests/Bug_3311_Regression/test.cpp
index 759c2d5edc9..8b471079b63 100644
--- a/TAO/tests/Bug_3311_Regression/test.cpp
+++ b/TAO/tests/Bug_3311_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/TAO/tests/Bug_3311_Regression/test.idl b/TAO/tests/Bug_3311_Regression/test.idl
index fed69c82366..e18898dc400 100644
--- a/TAO/tests/Bug_3311_Regression/test.idl
+++ b/TAO/tests/Bug_3311_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Oh ho, oh ho, what are we gonna do?
union CityBlue
switch (unsigned long long)
diff --git a/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc b/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
index ca50c7cc600..25c5b58f71c 100644
--- a/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
+++ b/TAO/tests/Bug_3315_Regression/Bug_3315_Regression.mpc
@@ -1,4 +1,2 @@
-// $Id$
-
project : taoserver, threads {
}
diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp
index dc73933c08b..472ac65e3bf 100644
--- a/TAO/tests/Bug_3315_Regression/main.cpp
+++ b/TAO/tests/Bug_3315_Regression/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Log_Msg.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc b/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
index ca50c7cc600..25c5b58f71c 100644
--- a/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
+++ b/TAO/tests/Bug_3321_Regression/Bug_3321_Regression.mpc
@@ -1,4 +1,2 @@
-// $Id$
-
project : taoserver, threads {
}
diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp
index 9b3d04f14a5..125ea313226 100644
--- a/TAO/tests/Bug_3321_Regression/main.cpp
+++ b/TAO/tests/Bug_3321_Regression/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Log_Msg.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Bug_3333_Regression/Bug3333.mpc b/TAO/tests/Bug_3333_Regression/Bug3333.mpc
index cf6897ad73f..0237d394884 100644
--- a/TAO/tests/Bug_3333_Regression/Bug3333.mpc
+++ b/TAO/tests/Bug_3333_Regression/Bug3333.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3333_Regression/client.cpp b/TAO/tests/Bug_3333_Regression/client.cpp
index 3e93f3fa15e..67f73bf3665 100644
--- a/TAO/tests/Bug_3333_Regression/client.cpp
+++ b/TAO/tests/Bug_3333_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Bug_3333_Regression/server.cpp b/TAO/tests/Bug_3333_Regression/server.cpp
index dd7521c191d..04db89bf0cb 100644
--- a/TAO/tests/Bug_3333_Regression/server.cpp
+++ b/TAO/tests/Bug_3333_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.cpp b/TAO/tests/Bug_3384_Regression/Client_i.cpp
index 02cc611be0d..9c421896d23 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
Client::~Client () {}
diff --git a/TAO/tests/Bug_3384_Regression/Client_i.h b/TAO/tests/Bug_3384_Regression/Client_i.h
index c9e63137ff0..ef594f641b5 100644
--- a/TAO/tests/Bug_3384_Regression/Client_i.h
+++ b/TAO/tests/Bug_3384_Regression/Client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
class Client : public POA_Test::Client
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp
index 7535a7ba5b8..8f25dbaffc7 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
Server::~Server () {}
diff --git a/TAO/tests/Bug_3384_Regression/Server_i.h b/TAO/tests/Bug_3384_Regression/Server_i.h
index a86ce789ee4..c801fc07d8b 100644
--- a/TAO/tests/Bug_3384_Regression/Server_i.h
+++ b/TAO/tests/Bug_3384_Regression/Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
class Server : public POA_Test::Server
diff --git a/TAO/tests/Bug_3384_Regression/Test.idl b/TAO/tests/Bug_3384_Regression/Test.idl
index 26e3211af05..552dda3f4a4 100644
--- a/TAO/tests/Bug_3384_Regression/Test.idl
+++ b/TAO/tests/Bug_3384_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Client
diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp
index c62f3924f2b..ea37462912c 100644
--- a/TAO/tests/Bug_3384_Regression/client.cpp
+++ b/TAO/tests/Bug_3384_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_3384_Regression/server.cpp b/TAO/tests/Bug_3384_Regression/server.cpp
index 41b9ef0b2d6..2c3909bbd65 100644
--- a/TAO/tests/Bug_3384_Regression/server.cpp
+++ b/TAO/tests/Bug_3384_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_3384_Regression/test.mpc b/TAO/tests/Bug_3384_Regression/test.mpc
index 6799573d8b1..c6e78f74dc0 100644
--- a/TAO/tests/Bug_3384_Regression/test.mpc
+++ b/TAO/tests/Bug_3384_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Bug_3384_Regression_idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc b/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
+++ b/TAO/tests/Bug_3430_Regression/Bug_3430_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3430_Regression/client.cpp b/TAO/tests/Bug_3430_Regression/client.cpp
index de34e78578e..2230f992228 100644
--- a/TAO/tests/Bug_3430_Regression/client.cpp
+++ b/TAO/tests/Bug_3430_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3430_Regression/server.cpp b/TAO/tests/Bug_3430_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3430_Regression/server.cpp
+++ b/TAO/tests/Bug_3430_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc b/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
index a654565c830..f18c8e1ed2d 100644
--- a/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
+++ b/TAO/tests/Bug_3470_Regression/Bug_3470_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc b/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
+++ b/TAO/tests/Bug_3471_Regression/Bug_3471_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3471_Regression/client.cpp b/TAO/tests/Bug_3471_Regression/client.cpp
index a5e47f38199..ba3af53f487 100644
--- a/TAO/tests/Bug_3471_Regression/client.cpp
+++ b/TAO/tests/Bug_3471_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3471_Regression/server.cpp b/TAO/tests/Bug_3471_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3471_Regression/server.cpp
+++ b/TAO/tests/Bug_3471_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc b/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
+++ b/TAO/tests/Bug_3479_Regression/Bug_3479_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3479_Regression/client.cpp b/TAO/tests/Bug_3479_Regression/client.cpp
index 7ca9221946d..7f22d1da75c 100644
--- a/TAO/tests/Bug_3479_Regression/client.cpp
+++ b/TAO/tests/Bug_3479_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/Bug_3479_Regression/server.cpp b/TAO/tests/Bug_3479_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3479_Regression/server.cpp
+++ b/TAO/tests/Bug_3479_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
index d2191dbb0a9..826e461b0cb 100644
--- a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
+++ b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FooC.h"
struct Foo_i : Foo
diff --git a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
index 5f8e4466364..c16b37fca44 100644
--- a/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
+++ b/TAO/tests/Bug_3481_Regression/Bug_3481_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
}
diff --git a/TAO/tests/Bug_3481_Regression/Foo.idl b/TAO/tests/Bug_3481_Regression/Foo.idl
index 5f6d273baa1..1e5081e173e 100644
--- a/TAO/tests/Bug_3481_Regression/Foo.idl
+++ b/TAO/tests/Bug_3481_Regression/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
//
local interface Foo {
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
index 6b4299cf74b..6b98c90e75b 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_Service.h"
ACE_DLL_Service::ACE_DLL_Service (void)
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h
index 09489a70dac..0d4d77d40de 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _DLL_SERVICE_H_
#define _DLL_SERVICE_H_
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.mpc b/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
index 3475913c0d2..3842272cc0f 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (Bug_3499_Regression) : aceexe {
exename = Bug_3499_Regression
Source_Files {
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
index 3bbdb0f0d4a..52ea597f868 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_Service.h"
#include "ace/DLL.h"
#include "ace/Service_Gestalt.h"
diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_export.h b/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
index 76950d32e1f..3af8b3e369c 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_Service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl ACE_DLL_SERVICE
// ------------------------------
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
index 783153c7f76..e6283b5bb5e 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DLL_TAO_Service.h"
ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service)
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
index 2b4f4d6e04c..0571daa891c 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _ACE_DLL_TAO_SERVICE_H_
#define _ACE_DLL_TAO_SERVICE_H_
diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
index e8db40b989a..b77273ed2e4 100644
--- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
+++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl ACE_DLL_TAO_SERVICE
// ------------------------------
diff --git a/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc b/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
index 754ee00f43a..be11f71251c 100644
--- a/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
+++ b/TAO/tests/Bug_3506_Regression/Bug_3506_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
IF_EXE_M_R_Enums.idl
diff --git a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
index 7d59af3b347..5a6f6819b3d 100644
--- a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
+++ b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Enums.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __IF_EXE_M_R_ENUMS_DEFINED
#define __IF_EXE_M_R_ENUMS_DEFINED
diff --git a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
index 0ffd3873a94..e7081ff5363 100644
--- a/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
+++ b/TAO/tests/Bug_3506_Regression/IF_EXE_M_R_Structs.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __IF_EXE_M_R_STRUCTS_DEFINED
#define __IF_EXE_M_R_STRUCTS_DEFINED
diff --git a/TAO/tests/Bug_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp
index fdf9f73ddf7..3367db61380 100644
--- a/TAO/tests/Bug_3506_Regression/client.cpp
+++ b/TAO/tests/Bug_3506_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IF_EXE_M_R_StructsC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index fe0f9a657e3..7dc4dff44c9 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IF_EXE_M_R_StructsS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc b/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
index 680ed44993f..9db6a33c76d 100644
--- a/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
+++ b/TAO/tests/Bug_3513_Regression/Bug_3513_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver, messaging, rtcorba, objreftemplate, rtscheduling, rtportableserver, ziop, tao_monitor {
exename = test
diff --git a/TAO/tests/Bug_3513_Regression/test.cpp b/TAO/tests/Bug_3513_Regression/test.cpp
index ca1b5553155..c1aef5a916d 100644
--- a/TAO/tests/Bug_3513_Regression/test.cpp
+++ b/TAO/tests/Bug_3513_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int
diff --git a/TAO/tests/Bug_3513_Regression/test.idl b/TAO/tests/Bug_3513_Regression/test.idl
index ae55732a3e3..0d78d196cad 100644
--- a/TAO/tests/Bug_3513_Regression/test.idl
+++ b/TAO/tests/Bug_3513_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/*
We've added a comment to the effect that this file does not contain the following
directives:
diff --git a/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
index bfe0e4b0ca1..2436f7d766a 100644
--- a/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
+++ b/TAO/tests/Bug_3514_Regression/Bug_3514_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : taoserver {
exename = test
diff --git a/TAO/tests/Bug_3514_Regression/test.cpp b/TAO/tests/Bug_3514_Regression/test.cpp
index 551a2224cb3..ea69484a5a0 100644
--- a/TAO/tests/Bug_3514_Regression/test.cpp
+++ b/TAO/tests/Bug_3514_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
int
diff --git a/TAO/tests/Bug_3514_Regression/test.idl b/TAO/tests/Bug_3514_Regression/test.idl
index 5a884db1d07..fdffe85e46a 100644
--- a/TAO/tests/Bug_3514_Regression/test.idl
+++ b/TAO/tests/Bug_3514_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
interface Foo : CORBA::Policy
diff --git a/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc b/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
index 2ea82e52ee9..c65d2f5035b 100644
--- a/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
+++ b/TAO/tests/Bug_3524_Regression/Bug_3524_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3524_Regression/client.cpp b/TAO/tests/Bug_3524_Regression/client.cpp
index 3ea509ada8d..25fba9db7f7 100644
--- a/TAO/tests/Bug_3524_Regression/client.cpp
+++ b/TAO/tests/Bug_3524_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Synch.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3524_Regression/server.cpp b/TAO/tests/Bug_3524_Regression/server.cpp
index 97ae58abd85..5f7bebdef93 100644
--- a/TAO/tests/Bug_3524_Regression/server.cpp
+++ b/TAO/tests/Bug_3524_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Bug_3524_Regression/test_i.cpp b/TAO/tests/Bug_3524_Regression/test_i.cpp
index 9b781340732..7491fe3ac95 100644
--- a/TAO/tests/Bug_3524_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3524_Regression/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc b/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
index 43f358a6893..9db1bc2a969 100644
--- a/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
+++ b/TAO/tests/Bug_3531_Regression/Bug_3531_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -GC
IDL_Files {
diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp
index 46730754841..966d2157fb8 100644
--- a/TAO/tests/Bug_3531_Regression/client.cpp
+++ b/TAO/tests/Bug_3531_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testS.h"
diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp
index 56909faf54b..f21c3a1c74f 100644
--- a/TAO/tests/Bug_3531_Regression/server.cpp
+++ b/TAO/tests/Bug_3531_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp
index fba6b1837aa..dd1e997fcc5 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3531_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3531_Regression/test_i.h b/TAO/tests/Bug_3531_Regression/test_i.h
index b4900377b9e..9a9caf09eff 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.h
+++ b/TAO/tests/Bug_3531_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BUG_2494_REGRESSION_TEST_I_H
#define TAO_BUG_2494_REGRESSION_TEST_I_H
diff --git a/TAO/tests/Bug_3531_Regression/test_i.inl b/TAO/tests/Bug_3531_Regression/test_i.inl
index 7660ba1707e..77862680d26 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.inl
+++ b/TAO/tests/Bug_3531_Regression/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc b/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
index fb15d15dda0..9af9b204ac3 100644
--- a/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
+++ b/TAO/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver {
after += *idl
Source_Files {
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 2d577b1291b..c687e3b5735 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Global_Macros.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3542_Regression/Bug_3542.mpc b/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
index efbc4ea397e..9dd010bb92e 100644
--- a/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
+++ b/TAO/tests/Bug_3542_Regression/Bug_3542.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server) : taoserver, threads {
after += *lib
Source_Files {
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
index 3db4aeac4d4..6f155b5eb33 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h
index 14f1418702c..616821e97cd 100644
--- a/TAO/tests/Bug_3542_Regression/DllOrb.h
+++ b/TAO/tests/Bug_3542_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3542_DllORB_h
#define bug_3542_DllORB_h
diff --git a/TAO/tests/Bug_3542_Regression/bug_3542_export.h b/TAO/tests/Bug_3542_Regression/bug_3542_export.h
index f10eb966097..35044704367 100644
--- a/TAO/tests/Bug_3542_Regression/bug_3542_export.h
+++ b/TAO/tests/Bug_3542_Regression/bug_3542_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3542
// ------------------------------
diff --git a/TAO/tests/Bug_3542_Regression/server.cpp b/TAO/tests/Bug_3542_Regression/server.cpp
index 88ec7288fe0..fbae206be4e 100644
--- a/TAO/tests/Bug_3542_Regression/server.cpp
+++ b/TAO/tests/Bug_3542_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Reactor.h"
#include "ace/Signal.h"
diff --git a/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc b/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
index 2963b96b98f..98df862c8d7 100644
--- a/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
+++ b/TAO/tests/Bug_3543_Regression/Bug_3543_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp
index 41fbd1e74ce..97d4d2f25b7 100644
--- a/TAO/tests/Bug_3543_Regression/master.cpp
+++ b/TAO/tests/Bug_3543_Regression/master.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Synch.h"
#include "ace/Task.h"
#include "masterS.h"
diff --git a/TAO/tests/Bug_3543_Regression/master.idl b/TAO/tests/Bug_3543_Regression/master.idl
index f5a320d9cd5..a1a413080fb 100644
--- a/TAO/tests/Bug_3543_Regression/master.idl
+++ b/TAO/tests/Bug_3543_Regression/master.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __MASTERCLIENT_IDL_DEFINED_
#define __MASTERCLIENT_IDL_DEFINED_
diff --git a/TAO/tests/Bug_3543_Regression/server.cpp b/TAO/tests/Bug_3543_Regression/server.cpp
index 48407d00ea6..e6365206e2e 100644
--- a/TAO/tests/Bug_3543_Regression/server.cpp
+++ b/TAO/tests/Bug_3543_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "masterS.h"
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc b/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
index 1f2d6e26874..b3ca0561a5b 100644
--- a/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
+++ b/TAO/tests/Bug_3547_Regression/Bug_3547_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl b/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
index acdc5c7fc8a..ff497c4e11c 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_idl
#define Stock_Quoter_idl
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index ee743895467..069664b64c3 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Strategies/advanced_resource.h"
// Stock Quoter Stub
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
index 1bd630bdd7c..83cc4f8df4d 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Stock Quoter includes
#include "Stock_Quoter_i.h"
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
index 4db2955928b..a9383c7dfb0 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Types.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_Types_idl
#define Stock_Quoter_Types_idl
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
index 3b8307fb1ab..751a23b473b 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stock_Quoter_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index 76b19672d68..554f6985a87 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef Stock_Quoter_i_h
#define Stock_Quoter_i_h
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest.idl b/TAO/tests/Bug_3547_Regression/UDPTest.idl
index 574225d21ea..5ca1b3e2688 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest.idl
+++ b/TAO/tests/Bug_3547_Regression/UDPTest.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _COMMON_UDPTEST_IDL_
#define _COMMON_UDPTEST_IDL_
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
index b11fd700251..e318f1ecfae 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDPTest_i.h"
#include <ace/Log_Msg.h>
diff --git a/TAO/tests/Bug_3547_Regression/UDPTest_i.h b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
index 86ed78f064e..3ecdc41eed6 100644
--- a/TAO/tests/Bug_3547_Regression/UDPTest_i.h
+++ b/TAO/tests/Bug_3547_Regression/UDPTest_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef UDPTest_i_h
#define UDPTest_i_h
diff --git a/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc b/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
index b8e2f931536..5fdd570c2c2 100644
--- a/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
+++ b/TAO/tests/Bug_3548_Regression/Bug_3548_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3548_Regression/client.cpp b/TAO/tests/Bug_3548_Regression/client.cpp
index 55e78601833..94b05e0b766 100644
--- a/TAO/tests/Bug_3548_Regression/client.cpp
+++ b/TAO/tests/Bug_3548_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//---------------------------------------------------------------------------
#include "memeaterC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3548_Regression/memeater.idl b/TAO/tests/Bug_3548_Regression/memeater.idl
index e670286e883..b53c79c5889 100644
--- a/TAO/tests/Bug_3548_Regression/memeater.idl
+++ b/TAO/tests/Bug_3548_Regression/memeater.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/StringSeq.pidl"
module MEMEATER
diff --git a/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc b/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
index c8c06c6c537..22184482a90 100644
--- a/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
+++ b/TAO/tests/Bug_3552_Regression/Bug_3552_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
idlflags += -SS
IDL_Files {
diff --git a/TAO/tests/Bug_3552_Regression/check.cpp b/TAO/tests/Bug_3552_Regression/check.cpp
index 457f54f2b52..2dbd38dfdb8 100644
--- a/TAO/tests/Bug_3552_Regression/check.cpp
+++ b/TAO/tests/Bug_3552_Regression/check.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "structC.h"
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
index 5d39f6ca5f6..41172b79b34 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
index 1067653093e..7c5e513ae16 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_Current.h"
diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
index 29f7a7e345f..eece267d31f 100644
--- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
+++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc b/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
+++ b/TAO/tests/Bug_3558_Regression/Bug_3558_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp
index 5ab6c0afd0c..8cca2b9be34 100644
--- a/TAO/tests/Bug_3558_Regression/client.cpp
+++ b/TAO/tests/Bug_3558_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3558_Regression/server.cpp b/TAO/tests/Bug_3558_Regression/server.cpp
index 77c03392be7..4e60c24483f 100644
--- a/TAO/tests/Bug_3558_Regression/server.cpp
+++ b/TAO/tests/Bug_3558_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
index 039c71fbbbf..bacd17277fc 100644
--- a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
+++ b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
index 7398d598257..25dc60c71ef 100644
--- a/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
+++ b/TAO/tests/Bug_3559_Regression/Bug_3559_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3559_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
index 377812a55bc..53c4d5e2b6e 100644
--- a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
+++ b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
#include "tao/Client_Strategy_Factory.h"
diff --git a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
index 42bb75be132..92efbd4f782 100644
--- a/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
+++ b/TAO/tests/Bug_3565_Regression/Bug_3565_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3565_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
index dec2418d9c2..6a2afc315a4 100644
--- a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
+++ b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
#include "tao/Client_Strategy_Factory.h"
diff --git a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
index 6b8b7e96bb3..dad324fc326 100644
--- a/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
+++ b/TAO/tests/Bug_3566_Regression/Bug_3566_Regression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Bug_3566_Regression_Test.cpp
diff --git a/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc b/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
index fad2c5ec8c6..98bb92bb8cc 100644
--- a/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
+++ b/TAO/tests/Bug_3567_Regression/Bug_3567_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc b/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
index 9635718fe6c..aec77065cb7 100644
--- a/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
+++ b/TAO/tests/Bug_3574_Regression/Bug_3574_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp
index dfc84f9946a..ef1115f6233 100644
--- a/TAO/tests/Bug_3574_Regression/test.cpp
+++ b/TAO/tests/Bug_3574_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/StringSeqC.h"
#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x680)
diff --git a/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc b/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
index 9635718fe6c..aec77065cb7 100644
--- a/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
+++ b/TAO/tests/Bug_3575_Regression/Bug_3575_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoclient {
Source_Files {
test.cpp
diff --git a/TAO/tests/Bug_3575_Regression/test.cpp b/TAO/tests/Bug_3575_Regression/test.cpp
index c461eb6431b..0a4558404a3 100644
--- a/TAO/tests/Bug_3575_Regression/test.cpp
+++ b/TAO/tests/Bug_3575_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/StringSeqC.h"
int
diff --git a/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc b/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
+++ b/TAO/tests/Bug_3597_Regression/Bug_3597_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp
index 81e60283d0b..30d0588d9c4 100644
--- a/TAO/tests/Bug_3597_Regression/server.cpp
+++ b/TAO/tests/Bug_3597_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/Log_Msg.h"
#include "ace/Log_Msg_Backend.h"
diff --git a/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc b/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
index 0e883f6f7b0..17f9a2615f2 100644
--- a/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
+++ b/TAO/tests/Bug_3598a_Regression/Bug_3598a_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
index 080ed0555b6..520d8bb3495 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index 206874fade3..cd707ae672f 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp
index 196100dbb5a..f951982118f 100644
--- a/TAO/tests/Bug_3598a_Regression/server.cpp
+++ b/TAO/tests/Bug_3598a_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc b/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
index bddd65f8a15..0333fd15a9d 100644
--- a/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
+++ b/TAO/tests/Bug_3630_Regression/Bug_3630_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
server.cpp
diff --git a/TAO/tests/Bug_3630_Regression/server.cpp b/TAO/tests/Bug_3630_Regression/server.cpp
index 99119586e4a..db7398f97c6 100644
--- a/TAO/tests/Bug_3630_Regression/server.cpp
+++ b/TAO/tests/Bug_3630_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc b/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
index 9729ceb7f7d..141123e7452 100644
--- a/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
+++ b/TAO/tests/Bug_3632_Regression/Bug_3632_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3632_Regression/test.cpp b/TAO/tests/Bug_3632_Regression/test.cpp
index fd5f1ade0d9..3cba4b38457 100644
--- a/TAO/tests/Bug_3632_Regression/test.cpp
+++ b/TAO/tests/Bug_3632_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_3632_Regression/test.idl b/TAO/tests/Bug_3632_Regression/test.idl
index 7f95d1147e2..d971c4d0ad6 100644
--- a/TAO/tests/Bug_3632_Regression/test.idl
+++ b/TAO/tests/Bug_3632_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
typedef sequence <string, 10> bounded_string_seq;
diff --git a/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc b/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
+++ b/TAO/tests/Bug_3636_Regression/Bug_3636_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3636_Regression/client.cpp b/TAO/tests/Bug_3636_Regression/client.cpp
index 07255c9e341..3711c9c4431 100644
--- a/TAO/tests/Bug_3636_Regression/client.cpp
+++ b/TAO/tests/Bug_3636_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3636_Regression/server.cpp b/TAO/tests/Bug_3636_Regression/server.cpp
index 1b45c1db07a..cb9bc5bfc2b 100644
--- a/TAO/tests/Bug_3636_Regression/server.cpp
+++ b/TAO/tests/Bug_3636_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
index 9bbd6a5fc6d..496ebdac06c 100644
--- a/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Backend_Impl.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc b/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
index 35be833411b..772d9b613f3 100644
--- a/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
+++ b/TAO/tests/Bug_3647_Regression/Bug_3647_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
index 1caa26c9e72..c5904345484 100644
--- a/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
+++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Middle_Impl.h"
Bug_3647_Regression::Middle_Impl::
diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp
index fa06b75a0a3..a2b8acf6003 100644
--- a/TAO/tests/Bug_3647_Regression/backend_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Backend_Impl.h"
#include "tao/Strategies/advanced_resource.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3647_Regression/client.cpp b/TAO/tests/Bug_3647_Regression/client.cpp
index 373bd1f36d7..2098f1ebec4 100644
--- a/TAO/tests/Bug_3647_Regression/client.cpp
+++ b/TAO/tests/Bug_3647_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TestC.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/Utils/PolicyList_Destroyer.h"
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index 23f29e825db..64f66ec17a1 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Middle_Impl.h"
#include "tao/Utils/PolicyList_Destroyer.h"
diff --git a/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc b/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
index fad2c5ec8c6..98bb92bb8cc 100644
--- a/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
+++ b/TAO/tests/Bug_3672_Regression/Bug_3672_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc b/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
index ac2bd7dc889..ff55121d7b3 100644
--- a/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
+++ b/TAO/tests/Bug_3674_Regression/Bug_3674_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver, pi_server, iorinterceptor {
requires += interceptors
diff --git a/TAO/tests/Bug_3674_Regression/test.cpp b/TAO/tests/Bug_3674_Regression/test.cpp
index 20d27ee5858..4ef25e55b91 100644
--- a/TAO/tests/Bug_3674_Regression/test.cpp
+++ b/TAO/tests/Bug_3674_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/ORBInitializer_Registry.h"
#include "tao/PI/PI.h"
diff --git a/TAO/tests/Bug_3674_Regression/test.idl b/TAO/tests/Bug_3674_Regression/test.idl
index 09e9fd73d76..20bd0642290 100644
--- a/TAO/tests/Bug_3674_Regression/test.idl
+++ b/TAO/tests/Bug_3674_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface testInterface
{
void firstCalling ();
diff --git a/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc b/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
index f024b91def8..e9839f9cad5 100644
--- a/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
+++ b/TAO/tests/Bug_3676_Regression/Bug_3676_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3676_Regression/client.cpp b/TAO/tests/Bug_3676_Regression/client.cpp
index cb20eaaf8d4..61ced830087 100644
--- a/TAO/tests/Bug_3676_Regression/client.cpp
+++ b/TAO/tests/Bug_3676_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/Transport.h"
diff --git a/TAO/tests/Bug_3676_Regression/server.cpp b/TAO/tests/Bug_3676_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3676_Regression/server.cpp
+++ b/TAO/tests/Bug_3676_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc b/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
index 9a3c4a1c7b3..59ab97918d4 100644
--- a/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
+++ b/TAO/tests/Bug_3683_Regression/Bug_3683_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Echo.idl
diff --git a/TAO/tests/Bug_3683_Regression/Echo.idl b/TAO/tests/Bug_3683_Regression/Echo.idl
index 993d08612bd..ffc69e77ab6 100644
--- a/TAO/tests/Bug_3683_Regression/Echo.idl
+++ b/TAO/tests/Bug_3683_Regression/Echo.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#if !defined (_ECHO_IDL)
#define _ECHO_IDL
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
index f3e45069e40..c96b220634c 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_i.h"
// Constructor.
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 392f20221cb..85475c11224 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SIMPLE_UTIL_C
#define SIMPLE_UTIL_C
diff --git a/TAO/tests/Bug_3683_Regression/server.cpp b/TAO/tests/Bug_3683_Regression/server.cpp
index 18eaefc297e..5358c916c87 100644
--- a/TAO/tests/Bug_3683_Regression/server.cpp
+++ b/TAO/tests/Bug_3683_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Simple_util.h"
#include "Echo_i.h"
diff --git a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
index 3d1ee4218f5..86381fa1184 100644
--- a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
+++ b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP == 0)
#include "ace/OS_main.h"
diff --git a/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc b/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
index f4f5bc2a5e2..3d6edfdcc86 100644
--- a/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
+++ b/TAO/tests/Bug_3695_Regression/Bug_3695_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: taoclient {
exename = *
}
diff --git a/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
index e9fa8a23ed9..843dce03b63 100644
--- a/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
+++ b/TAO/tests/Bug_3701_Regression/Bug_3701_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient {
Source_Files {
client.cpp
diff --git a/TAO/tests/Bug_3701_Regression/client.cpp b/TAO/tests/Bug_3701_Regression/client.cpp
index a3cea619961..3672ccaee44 100644
--- a/TAO/tests/Bug_3701_Regression/client.cpp
+++ b/TAO/tests/Bug_3701_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/SystemException.h"
int
diff --git a/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc b/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
index d6323251520..17a187ea935 100644
--- a/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
+++ b/TAO/tests/Bug_3746_Regression/Bug_3746_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3746_Regression/client.cpp b/TAO/tests/Bug_3746_Regression/client.cpp
index 75df0ef04eb..10215aab92b 100644
--- a/TAO/tests/Bug_3746_Regression/client.cpp
+++ b/TAO/tests/Bug_3746_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3746_Regression/server.cpp b/TAO/tests/Bug_3746_Regression/server.cpp
index 3d1d8ef00f8..4386d4f89a2 100644
--- a/TAO/tests/Bug_3746_Regression/server.cpp
+++ b/TAO/tests/Bug_3746_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc b/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
index 324361185ce..a4d0f6259d9 100644
--- a/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
+++ b/TAO/tests/Bug_3748_Regression/Bug_3748_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3748_Regression/client.cpp b/TAO/tests/Bug_3748_Regression/client.cpp
index 1742dd08168..08a76ad8e13 100644
--- a/TAO/tests/Bug_3748_Regression/client.cpp
+++ b/TAO/tests/Bug_3748_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3748_Regression/server.cpp b/TAO/tests/Bug_3748_Regression/server.cpp
index 45229e6a070..77e3721d623 100644
--- a/TAO/tests/Bug_3748_Regression/server.cpp
+++ b/TAO/tests/Bug_3748_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "Server_ORBInitializer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc b/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
index 1ecceb08eb8..cb4e9bb8f1f 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
+++ b/TAO/tests/Bug_3755_Ext_Regression/Bug_3755_Ext_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoexe {
exename=server
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.cpp b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
index 1d4f5d60fb5..eca6a8dd8c0 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.cpp
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.h b/TAO/tests/Bug_3755_Ext_Regression/common.h
index b289652ad3b..023c2784466 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/common.h
+++ b/TAO/tests/Bug_3755_Ext_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ace_wchar.h"
#define FIRST_ORB_NAME "first_orb"
diff --git a/TAO/tests/Bug_3755_Ext_Regression/server.cpp b/TAO/tests/Bug_3755_Ext_Regression/server.cpp
index 1fc73c84bc9..3472cde21c1 100644
--- a/TAO/tests/Bug_3755_Ext_Regression/server.cpp
+++ b/TAO/tests/Bug_3755_Ext_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/OS_main.h"
diff --git a/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc b/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
index e56827334f8..791c649006b 100644
--- a/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
+++ b/TAO/tests/Bug_3755_Regression/Bug_3755_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : rt_server {
exename=server
diff --git a/TAO/tests/Bug_3755_Regression/server.cpp b/TAO/tests/Bug_3755_Regression/server.cpp
index b0c61046df8..24ba8277b20 100644
--- a/TAO/tests/Bug_3755_Regression/server.cpp
+++ b/TAO/tests/Bug_3755_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc b/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
index 4575ede6262..8eb31c220cb 100644
--- a/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
+++ b/TAO/tests/Bug_3766_Regression/Bug_3766_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_3766_Regression/Test.idl b/TAO/tests/Bug_3766_Regression/Test.idl
index ae6bc0d1a95..e21baea0179 100644
--- a/TAO/tests/Bug_3766_Regression/Test.idl
+++ b/TAO/tests/Bug_3766_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IDL_
#define TEST_IDL_
diff --git a/TAO/tests/Bug_3766_Regression/client.cpp b/TAO/tests/Bug_3766_Regression/client.cpp
index 0999ff151a5..ef7380fcb27 100644
--- a/TAO/tests/Bug_3766_Regression/client.cpp
+++ b/TAO/tests/Bug_3766_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3766_Regression/server.cpp b/TAO/tests/Bug_3766_Regression/server.cpp
index aaeece0c1f0..a0785ac0311 100644
--- a/TAO/tests/Bug_3766_Regression/server.cpp
+++ b/TAO/tests/Bug_3766_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestI.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc b/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
index 14376c453f7..cff7fb39873 100644
--- a/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
+++ b/TAO/tests/Bug_3790_Regression/Bug_3790_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3790_Regression/server.cpp b/TAO/tests/Bug_3790_Regression/server.cpp
index 321f89d50de..80f2e8df786 100644
--- a/TAO/tests/Bug_3790_Regression/server.cpp
+++ b/TAO/tests/Bug_3790_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3790_Regression/server2.cpp b/TAO/tests/Bug_3790_Regression/server2.cpp
index c5aa3b8fd39..dc3b6a55cc6 100644
--- a/TAO/tests/Bug_3790_Regression/server2.cpp
+++ b/TAO/tests/Bug_3790_Regression/server2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_testC.h"
#include "tao/ORB_Core.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/tests/Bug_3790_Regression/simple_test.idl b/TAO/tests/Bug_3790_Regression/simple_test.idl
index 308e9420436..11cce4bbd8f 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test.idl
+++ b/TAO/tests/Bug_3790_Regression/simple_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SIMPLE_TEST_
#define _SIMPLE_TEST_
diff --git a/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc b/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
index 8f06935f63e..b51d1214a97 100644
--- a/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
+++ b/TAO/tests/Bug_3801_Regression/Bug_3801_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
ami_test.idl
diff --git a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc b/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
index a38353822bc..b9203d83349 100644
--- a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
+++ b/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -SS
diff --git a/TAO/tests/Bug_3821_Regression/test.cpp b/TAO/tests/Bug_3821_Regression/test.cpp
index fb63782b2cc..b25544377c1 100644
--- a/TAO/tests/Bug_3821_Regression/test.cpp
+++ b/TAO/tests/Bug_3821_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/CDR.h"
diff --git a/TAO/tests/Bug_3821_Regression/test.idl b/TAO/tests/Bug_3821_Regression/test.idl
index fb1fd5a0f07..bd10ab38ec2 100644
--- a/TAO/tests/Bug_3821_Regression/test.idl
+++ b/TAO/tests/Bug_3821_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
enum Enumeration {
Enum1,
diff --git a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc b/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
index ab00104856d..ae1fabfc6e9 100644
--- a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
+++ b/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server) : taoexe {
exename=server
diff --git a/TAO/tests/Bug_3826_Regression/server.cpp b/TAO/tests/Bug_3826_Regression/server.cpp
index ffd0e3ce029..efb2cee071b 100644
--- a/TAO/tests/Bug_3826_Regression/server.cpp
+++ b/TAO/tests/Bug_3826_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ARGV.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc b/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
index e289841bc90..3c9395e3bf1 100644
--- a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
+++ b/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
Message.idl
diff --git a/TAO/tests/Bug_3827_Regression/Message.idl b/TAO/tests/Bug_3827_Regression/Message.idl
index 848d48e50a4..b726e81fe48 100644
--- a/TAO/tests/Bug_3827_Regression/Message.idl
+++ b/TAO/tests/Bug_3827_Regression/Message.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Message
{
public string user;
diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp
index 22259070653..1a8ebec6c85 100644
--- a/TAO/tests/Bug_3827_Regression/test.cpp
+++ b/TAO/tests/Bug_3827_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessageC.h"
#include "ace/Task.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc b/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
index 075f60c2d48..213b5c67c8b 100644
--- a/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
+++ b/TAO/tests/Bug_3837_Regression/Bug_3837_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3837_Regression/client.cpp b/TAO/tests/Bug_3837_Regression/client.cpp
index 21984fb845a..d262dd875dd 100644
--- a/TAO/tests/Bug_3837_Regression/client.cpp
+++ b/TAO/tests/Bug_3837_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3837_Regression/server.cpp b/TAO/tests/Bug_3837_Regression/server.cpp
index beb88556a6c..2959b24a3cc 100644
--- a/TAO/tests/Bug_3837_Regression/server.cpp
+++ b/TAO/tests/Bug_3837_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3845_Regression/local_inarg.idl b/TAO/tests/Bug_3845_Regression/local_inarg.idl
index 9da93b559f0..c20a2c5fccd 100644
--- a/TAO/tests/Bug_3845_Regression/local_inarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_inarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_inoutarg.idl b/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
index 9fb031150ef..aa2d98b7219 100644
--- a/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_inoutarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_outarg.idl b/TAO/tests/Bug_3845_Regression/local_outarg.idl
index a0c7e219183..2d18d523bca 100644
--- a/TAO/tests/Bug_3845_Regression/local_outarg.idl
+++ b/TAO/tests/Bug_3845_Regression/local_outarg.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3845_Regression/local_rettype.idl b/TAO/tests/Bug_3845_Regression/local_rettype.idl
index ec9f10b51eb..a684da60c8f 100644
--- a/TAO/tests/Bug_3845_Regression/local_rettype.idl
+++ b/TAO/tests/Bug_3845_Regression/local_rettype.idl
@@ -1,5 +1,3 @@
-// $Id$
-
local interface foo
{
};
diff --git a/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc b/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
index 006aedecaa7..4104c4f6f9d 100644
--- a/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
+++ b/TAO/tests/Bug_3853_Regression/Bug_3853_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Hello.idl
diff --git a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
index 1c7d6c0cfe8..b41b6229938 100644
--- a/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3853_Regression/Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
index 4e768a2cb8e..1dfc25c5da6 100644
--- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp
+++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp
index 765f8677cfd..7428570eb11 100644
--- a/TAO/tests/Bug_3853_Regression/client.cpp
+++ b/TAO/tests/Bug_3853_Regression/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello_i.h"
#include "HelloC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
index 27d67cdddad..0c0313eee35 100644
--- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "HelloC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Bug_3853_Regression/server.cpp b/TAO/tests/Bug_3853_Regression/server.cpp
index 8067030c910..4d8dbec41a1 100644
--- a/TAO/tests/Bug_3853_Regression/server.cpp
+++ b/TAO/tests/Bug_3853_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello_i.h"
#include "HelloC.h"
diff --git a/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc b/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
index 75e2eb600fa..06bb23c8c68 100644
--- a/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
+++ b/TAO/tests/Bug_3896_Regression/Bug_3896_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp
index a43d2445314..ee3b10eac8d 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3896_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp
index 0df5f4ce769..89330ba57a9 100644
--- a/TAO/tests/Bug_3896_Regression/client.cpp
+++ b/TAO/tests/Bug_3896_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task_T.h"
diff --git a/TAO/tests/Bug_3896_Regression/server.cpp b/TAO/tests/Bug_3896_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3896_Regression/server.cpp
+++ b/TAO/tests/Bug_3896_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp
index 46043d0d3ee..b28f967a261 100644
--- a/TAO/tests/Bug_3919_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3919_Regression/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3919_Regression/Test2.idl b/TAO/tests/Bug_3919_Regression/Test2.idl
index d66a82bc32c..4bc2e2f6892 100644
--- a/TAO/tests/Bug_3919_Regression/Test2.idl
+++ b/TAO/tests/Bug_3919_Regression/Test2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test.idl"
module Test2
diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp
index a1aa68d5292..2fe749eea90 100644
--- a/TAO/tests/Bug_3919_Regression/client.cpp
+++ b/TAO/tests/Bug_3919_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test2C.h"
#include "tao/IFR_Client/IFR_BaseC.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/Bug_3919_Regression/server.cpp b/TAO/tests/Bug_3919_Regression/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Bug_3919_Regression/server.cpp
+++ b/TAO/tests/Bug_3919_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc b/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
index 342e78b964b..ce8d1f50c08 100644
--- a/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
+++ b/TAO/tests/Bug_3926_Regression/Bug_3926_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
index bc817f79d96..bdbaa9f53a2 100644
--- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
index 65f0a38924b..7e908d06d22 100644
--- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
index 86e2837dc17..bb010e4f324 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
index 0328ecbeb55..eca718ce32a 100644
--- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
+++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_3926_Regression/client.cpp b/TAO/tests/Bug_3926_Regression/client.cpp
index e56deca7d19..5c16c0ca9ff 100644
--- a/TAO/tests/Bug_3926_Regression/client.cpp
+++ b/TAO/tests/Bug_3926_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Bug_3926_Regression/server.cpp b/TAO/tests/Bug_3926_Regression/server.cpp
index 99a2277b57c..14719cd5a44 100644
--- a/TAO/tests/Bug_3926_Regression/server.cpp
+++ b/TAO/tests/Bug_3926_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3926_Regression/test.idl b/TAO/tests/Bug_3926_Regression/test.idl
index 3c60aba7dd8..8e6a75c217f 100644
--- a/TAO/tests/Bug_3926_Regression/test.idl
+++ b/TAO/tests/Bug_3926_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module hello {
interface GoodDay {
short number ();
diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp
index bbaee56dd3e..f0afd143e1c 100644
--- a/TAO/tests/Bug_3926_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3926_Regression/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc b/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
index da3efeb647e..c5186092bb2 100644
--- a/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
+++ b/TAO/tests/Bug_3941_Regression/Bug_3941_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3941_Regression/test.cpp b/TAO/tests/Bug_3941_Regression/test.cpp
index 93813ed2bcb..cd183759598 100644
--- a/TAO/tests/Bug_3941_Regression/test.cpp
+++ b/TAO/tests/Bug_3941_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
int
diff --git a/TAO/tests/Bug_3941_Regression/test.idl b/TAO/tests/Bug_3941_Regression/test.idl
index 6bb4c5056be..a6b184c1c75 100644
--- a/TAO/tests/Bug_3941_Regression/test.idl
+++ b/TAO/tests/Bug_3941_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
abstract valuetype EventBase { };
diff --git a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
index 2efbc1589ae..b32ae1e6d27 100644
--- a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
+++ b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "FooS.h"
#include "tao/LocalObject.h"
#include "tao/Version.h"
diff --git a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
index 2d2ba812208..a90bf4aa21b 100644
--- a/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
+++ b/TAO/tests/Bug_3942_Regression/Bug_3942_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: taoexe {
macros += LOCAL
idlflags += -DLOCAL
diff --git a/TAO/tests/Bug_3942_Regression/Foo.idl b/TAO/tests/Bug_3942_Regression/Foo.idl
index a3d1a343e9b..68cf58a5056 100644
--- a/TAO/tests/Bug_3942_Regression/Foo.idl
+++ b/TAO/tests/Bug_3942_Regression/Foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifdef LOCAL
local
#endif
diff --git a/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc b/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
index ad221b73797..e6d6a6815f2 100644
--- a/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
+++ b/TAO/tests/Bug_3953_Regression/Bug_3953_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*_Idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp
index e750f653289..d28e168eedf 100644
--- a/TAO/tests/Bug_3953_Regression/client.cpp
+++ b/TAO/tests/Bug_3953_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Bug_3953_Regression/client_i.cpp b/TAO/tests/Bug_3953_Regression/client_i.cpp
index 7525ef2160c..c25ba3f761f 100644
--- a/TAO/tests/Bug_3953_Regression/client_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
client_i::client_i (int quiet,
diff --git a/TAO/tests/Bug_3953_Regression/client_i.h b/TAO/tests/Bug_3953_Regression/client_i.h
index b0d308f04b8..a257039dab6 100644
--- a/TAO/tests/Bug_3953_Regression/client_i.h
+++ b/TAO/tests/Bug_3953_Regression/client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class client_i : public POA_client
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index 2a1c46c05f4..3480610622f 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp
index d0a374dc038..2fb5b3cd48c 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.cpp
+++ b/TAO/tests/Bug_3953_Regression/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (int quiet,
diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h
index a60c9f8876d..c8605f01478 100644
--- a/TAO/tests/Bug_3953_Regression/server_i.h
+++ b/TAO/tests/Bug_3953_Regression/server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/Bug_3953_Regression/test.idl b/TAO/tests/Bug_3953_Regression/test.idl
index 45664cfb035..5c32f4d0456 100644
--- a/TAO/tests/Bug_3953_Regression/test.idl
+++ b/TAO/tests/Bug_3953_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc b/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
+++ b/TAO/tests/Bug_3954_Regression/Bug_3954_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.cpp
+++ b/TAO/tests/Bug_3954_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_3954_Regression/client.cpp b/TAO/tests/Bug_3954_Regression/client.cpp
index 1bb3e718137..db10fc575b3 100644
--- a/TAO/tests/Bug_3954_Regression/client.cpp
+++ b/TAO/tests/Bug_3954_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_3954_Regression/server.cpp b/TAO/tests/Bug_3954_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_3954_Regression/server.cpp
+++ b/TAO/tests/Bug_3954_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc b/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
+++ b/TAO/tests/Bug_4010_Regression/Bug_4010_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_4010_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4010_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_4010_Regression/client.cpp b/TAO/tests/Bug_4010_Regression/client.cpp
index 9e5ab1f44da..d54634333dd 100644
--- a/TAO/tests/Bug_4010_Regression/client.cpp
+++ b/TAO/tests/Bug_4010_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/Bug_4010_Regression/server.cpp b/TAO/tests/Bug_4010_Regression/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Bug_4010_Regression/server.cpp
+++ b/TAO/tests/Bug_4010_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc b/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
index 6f150f6058b..2cbd595fcd2 100644
--- a/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
+++ b/TAO/tests/Bug_4059_Regression/Bug_4059_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Bug_4059_Regression/Hello.cpp
+++ b/TAO/tests/Bug_4059_Regression/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Bug_4059_Regression/client.cpp b/TAO/tests/Bug_4059_Regression/client.cpp
index 1d9cbe489c2..774de214a0d 100644
--- a/TAO/tests/Bug_4059_Regression/client.cpp
+++ b/TAO/tests/Bug_4059_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_ManagerC.h"
diff --git a/TAO/tests/Bug_4059_Regression/server.cpp b/TAO/tests/Bug_4059_Regression/server.cpp
index 5d5f0b3ed04..51d27ad8557 100644
--- a/TAO/tests/Bug_4059_Regression/server.cpp
+++ b/TAO/tests/Bug_4059_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
index 3e8425915dd..6a5cacc2654 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Bug_4082_RegressionC.h"
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
index 2eaf7daadc4..7861fa74b28 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.idl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/LongSeq.pidl"
typedef sequence<long> MyLongSeq;
diff --git a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
index 9e239111671..09594c2588a 100644
--- a/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
+++ b/TAO/tests/Bug_4082_Regression/Bug_4082_Regression.mpc
@@ -1,3 +1,2 @@
-// $Id$
project: taoclient, anytypecode {
}
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
index 81440cf3aea..579feca98c7 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Bug_4097_RegressionS.h"
#include "tao/corba.h"
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
index 7fe7a9e7dab..669e6a3f475 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
union MultiLabelUnion switch (long) {
case 0:
case 1:
diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
index 516a0bbe2d3..b8f8c67b00b 100644
--- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
+++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoserver, messaging, gen_ostream {
custom_only=1
IDL_Files {
diff --git a/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc b/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
index 261c70d9856..5eaf287b304 100644
--- a/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
+++ b/TAO/tests/Bug_933_Regression/Bug_933_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/Bug_933_Regression/Messenger.idl b/TAO/tests/Bug_933_Regression/Messenger.idl
index 8e58fb36240..869e639b27b 100644
--- a/TAO/tests/Bug_933_Regression/Messenger.idl
+++ b/TAO/tests/Bug_933_Regression/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orb.idl"
interface Messenger
diff --git a/TAO/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index d21be49dd53..3905d3e4f05 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "tao/CodecFactory/CodecFactory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index 37959ffa361..af48c1b83ce 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
index 3bd849e1337..bbc91d00fed 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/CodecFactory/CodecFactory.h"
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index 486c2e3ee67..3736ecb672e 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H_
#define MESSENGER_I_H_
diff --git a/TAO/tests/CDR/CDR.mpc b/TAO/tests/CDR/CDR.mpc
index cfbc027a2b2..9451bd04e75 100644
--- a/TAO/tests/CDR/CDR.mpc
+++ b/TAO/tests/CDR/CDR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Alignment) : taoexe {
exename = alignment
diff --git a/TAO/tests/COIOP/COIOP_Tests.mpc b/TAO/tests/COIOP/COIOP_Tests.mpc
index 0e20ade2b85..bb2ded41b0e 100644
--- a/TAO/tests/COIOP/COIOP_Tests.mpc
+++ b/TAO/tests/COIOP/COIOP_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 4618639b2b0..37c5c9a9a99 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/tests/COIOP/Client_Task.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Task.h"
#include "tao/ORB_Core.h"
#include "TestC.h"
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index 71272b4add1..78d9023ccef 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index f7bf8b30613..04abb027a27 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
+++ b/TAO/tests/CORBA_e_Implicit_Activation/CORBA_e_Implicit_Activation.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
index 9062a8c7220..d8d1b94047d 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
index 1d841625924..c01002514e5 100644
--- a/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
+++ b/TAO/tests/CSD_Collocation/CSD_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoserver, taoidldefaults, strategies, csd_threadpool, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
idlflags += -Gd -St -Sa
exename = Collocation
diff --git a/TAO/tests/CSD_Collocation/Collocation.cpp b/TAO/tests/CSD_Collocation/Collocation.cpp
index 1daaff56119..0a2b05d4b8a 100644
--- a/TAO/tests/CSD_Collocation/Collocation.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/CSD_Framework/CSD_ORBInitializer.h"
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index b5df2c741b5..0b85fcbe51b 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/CSD_Collocation/Diamond.idl b/TAO/tests/CSD_Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/CSD_Collocation/Diamond.idl
+++ b/TAO/tests/CSD_Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.cpp b/TAO/tests/CSD_Collocation/Diamond_i.cpp
index 8db13a90689..cede8ba100c 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.cpp
+++ b/TAO/tests/CSD_Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h
index f8b04710830..9c40c7fe247 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.h
+++ b/TAO/tests/CSD_Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index f1bfd44f74a..b9ae2cb7e37 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index f319293d3ed..fa005fdda5c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 4ca2dc82800..ea45b56328d 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index 50d125e8193..3141df7fde7 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index f1979e1a13d..084647b1edd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppHelper.h"
void
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 1799f1032f3..27aaab8a148 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APPHELPER_H
#define APPHELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
index cfb13da0cd9..676e4ae79f2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index 097249686ee..a8307ab45b4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef APP_SHUTDOWN_H
#define APP_SHUTDOWN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
index 9ebd7dc8f34..d2cadef5379 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Test
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
index 8f9afcf68de..379a8ce41d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CANCELAPPXCEPTION_IDL
#define CANCELAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
index 361bb3cd465..221781e1b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
index dbc71737f99..5f8ac3afd29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientTask.h"
#include "ClientEngine.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
index 794900c41ce..e5ad609a19e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CUSTOMEXCEPTION_IDL
#define CUSTOMEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
index 4f76953e24c..330914baa72 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOOEXCEPTION_IDL
#define FOOEXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 812495cc732..4284e163ee8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "OrbRunner.h"
#include "OrbTask.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
index 8e3f8138239..36fff3dd607 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ORB_RUNNER_H
#define ORB_RUNNER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 738af1ea9df..48663b6fc01 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServantList_T.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
index 43e639c9beb..20607775fd3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVANTLIST_T_H
#define SERVANTLIST_T_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
index 8e39e223b45..46fabc593e8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "StatisticsHelper.h"
// swap function for integers
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
index 16ed9c88eef..ae95c226bf7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_HELPER_H
#define STATISTICS_HELPER_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
index faa872c6e87..eb6905eb2e3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestAppBase.h"
TestAppBase::TestAppBase(const char* name)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
index 3d52871e907..0fb4aaaaa9f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPBASE_H
#define TESTAPPBASE_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
index 2ac53939b77..f4cf0a8d88c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPXCEPTION_IDL
#define TESTAPPXCEPTION_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
index bcbdb6e9e6b..a5e08322381 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TESTAPPMAIN_H
#define TESTAPPMAIN_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
index 9b855c486d8..ca907778452 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_A
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
index e9f3b0345f8..86c7b7e96d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_IDL
#define FOO_A_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index 94e0a9d13d8..6b776551fd7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_ClientEngine.h"
#include "Foo_A_Statistics.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
index 82cb6b65221..c98bd78c21b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_Statistics.h"
#include "Foo_A_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
index b9301b915bf..f2b979cea57 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_A_H
#define STATISTICS_A_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index a7ca8835ecc..c6b4504db22 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_A_i.h"
#include "AppShutdown.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 16a53f60ddf..8f5bde6d947 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_A_I_H
#define FOO_A_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
index c6e2f4cd967..dd19470fae6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_B
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
index 717d74adea5..5a57daa64f1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_IDL
#define CALLBACK_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 31b0d120dae..2a43feb4f6d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Callback_i.h"
Callback_i::Callback_i()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index cb9b851c68e..04b2d94c5d2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
index 949f08397ad..e5ee97f163e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_IDL
#define FOO_B_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index 9d497df00c9..6592f5b0720 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_ClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index 0c41b14b0bc..b6d215e0a94 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_SimpleClientEngine.h"
#include "Callback_i.h"
#include "Foo_B_Statistics.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index 2db50ba7eb8..79cdd00ed9b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_B_Statistics.h"
#include "Foo_B_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
index e8d9569a2d5..6dadbe4d564 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_B_H
#define STATISTICS_B_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 5e90582eff3..151dda93167 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_B_i.h"
#include "AppShutdown.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 1a0367a27e7..6ad53b221ff 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_B_I_H
#define FOO_B_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
index ef1996b0a26..8e8044b90e7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s CSD_TP_Foo_C
// ------------------------------
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
index b7eeea96f33..6315c0beae8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_IDL
#define FOO_C_IDL
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index b84640b56e0..3b66b5e29c9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_ClientEngine.h"
#include "AppHelper.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index 260bf44b3e9..8d717ec510d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_ClientEngine.h"
#include "CustomExceptionC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index acd49fa4665..b33c12bfa71 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Custom_Proxy.h"
#include "Foo_C_cust_op1.h"
#include "Foo_C_cust_op2.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
index b6155743e3b..6f314f493a4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_Statistics.h"
#include "Foo_C_ClientEngine.h"
#include "Foo_C_Custom_ClientEngine.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
index f115ddc2b1f..79de17967ee 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef STATISTICS_C_H
#define STATISTICS_C_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 36734cadf2b..7d20b104616 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op1.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index 40ffbf190f9..7a6933c5dfd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op2.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index 7e009e52230..33d68371a87 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op3.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
index f4acb9c02d8..34164cc5149 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op4.h"
#include "Foo_C_i.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 9a165fe984c..134cf755d07 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_cust_op5.h"
#include "Foo_C_i.h"
#include "CancelledExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index d9e11bfad32..144f2027738 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Foo_C_i.h"
#include "AppShutdown.h"
#include "CustomExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index 6262bce85dd..cd858e9c49f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef FOO_C_I_H
#define FOO_C_I_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
index 50a4510a73b..f7d3362010c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index 3524f4f98cc..b94c0b06e9c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index b5910996e11..b0056a179c3 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
index 02cac4dc7da..b87548082df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 21b94144ddd..abde30b72f6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index 3ed51561d1d..1afc33c0b6e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index 1cd428ddf23..a9331abcc0a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 1e1dc4811d0..32f98b91403 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
index 0be257accae..f756a6920fc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
index 016caef75ef..c8949cca955 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_b {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index a9b8b14ed5e..96b4f181f3e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 02d78238a8c..e4b0a709066 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 87d51f92e3b..9d43cef70aa 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 0246da44cf8..1be5ea37097 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
index ca9f92ac607..99ba4b4b33f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_c {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index d2b3b5b90a8..6c37f9ed293 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "AppHelper.h"
#include "TestAppExceptionC.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index a9dad6ccc1b..f89df26d866 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 93b84ad02dd..25383409b9e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "AppHelper.h"
#include "OrbRunner.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index a61522a1372..8628996fce9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
index 3814bef5ff9..fd4c8a7712c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
index 116a9142daa..9472aca3ec4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index abaed430dc8..144fb6910b1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 5d2ca8262dc..f403566be8e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
index afd9e5d8e68..f9d7d6f9d66 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): csd_tp_test_exe_a {
exename=server_main
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index b2facabbb25..55a40bae54e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "Foo_A_ClientEngine.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index 413b57bb450..eeddb17762a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef CLIENTAPP_H
#define CLIENTAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 3e235a78124..00076b5953a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "Foo_A_i.h"
#include "AppHelper.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index db7bd534377..4c2cf169f29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef SERVERAPP_H
#define SERVERAPP_H
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
index ae98ca0f6ac..b798f83431d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ClientApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
index 82e987f6d41..788ec14c7ea 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ServerApp.h"
#include "TestAppMain.h"
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 899a542fef2..944cc8de6d6 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index f441e3de509..20650ac0a36 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index 428a7c13ff9..61d29a4267f 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 2bd74f5ef3a..29dfafe71c2 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index 8a291889707..23cb32f14c8 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 001a9741513..f22b679fb08 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/ClientPortSpan/ClientPortSpan.mpc b/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
+++ b/TAO/tests/ClientPortSpan/ClientPortSpan.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/ClientPortSpan/Hello.cpp
+++ b/TAO/tests/ClientPortSpan/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ClientPortSpan/client.cpp b/TAO/tests/ClientPortSpan/client.cpp
index 9947b25b910..c132a448177 100644
--- a/TAO/tests/ClientPortSpan/client.cpp
+++ b/TAO/tests/ClientPortSpan/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/ClientPortSpan/server.cpp b/TAO/tests/ClientPortSpan/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/ClientPortSpan/server.cpp
+++ b/TAO/tests/ClientPortSpan/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index b261a907e44..d1672e74ace 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index e2585d5704e..77152ee162e 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index c968b21002a..87665d4fbc5 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index b748d79f4bb..18006da3b87 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Process_Factory.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
index feaa8c5ddea..0c453b29354 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/CodeSets_libs_IMB1047_ISO8859.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taolib, codeset {
sharedname = IBM1047_ISO8859
dynamicflags += IBM1047_ISO8859_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h
index 5a31c9c23b9..0b297054ce2 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc b/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
index c3b0ca24fc1..c64af74a125 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/CodeSets_libs_UCS4_UTF16.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taolib, codeset {
sharedname = UCS4_UTF16
dynamicflags += UCS4_UTF16_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
index fa625d9c229..570a3667621 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "WUCS4_UTF16_Factory.h"
ACE_STATIC_SVC_DEFINE (WUCS4_UTF16_Factory,
diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h
index d668942ef44..54469836705 100644
--- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h
+++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
index 4cf0aa5b954..fb5399bd717 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taolib, codeset {
sharedname = UTF16_UCS2
dynamicflags += UTF16_UCS2_BUILD_DLL
diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
index cfb9738322b..abcd4280f7d 100644
--- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
+++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s UTF16_UCS2
// ------------------------------
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 41daa57f1be..90e1980fcaf 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
simple.idl
diff --git a/TAO/tests/CodeSets/simple/simple.idl b/TAO/tests/CodeSets/simple/simple.idl
index 9f58cc8869f..248c9701375 100644
--- a/TAO/tests/CodeSets/simple/simple.idl
+++ b/TAO/tests/CodeSets/simple/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface simple
{
string op1 (in string name,
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index aea55d91e36..3cb10743126 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, codecfactory, codeset {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index a884ba63952..c675031b0c2 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/CodecFactory/CodecFactory.h"
#include "tao/Codeset/Codeset.h"
#include "testC.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
index 2521cb67dda..c94e2b9b5ea 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Enable DIRECT Collocation, disable Thru_Poa
project(Collocated_Best_Direct): taoserver {
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
index 9604c0aff49..8bf60bbdad7 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable Thru_Pu and don't enable Direct
project(Collocated_Best_NoColl): taoserver {
exename = Collocated_Best_NoColl
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
index 1d2e67eccdc..ca598f30bfc 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Poa default enabled, Direct default disabled
project(Collocated_Best_ThruP): taoserver {
exename = Collocated_Best_ThruP
diff --git a/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc b/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
index 7fab7ae785c..65cb408f039 100644
--- a/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
+++ b/TAO/tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Pu is disabled, enable direct
project(Collocated_DIF): taoserver {
exename = Collocated_DerivedIF
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp
index ad2dff673c9..400c6b2a709 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.cpp
+++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/ORB_Core.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tests/Collocated_DerivedIF/Test.idl b/TAO/tests/Collocated_DerivedIF/Test.idl
index b0eef86c20b..76d36162f6c 100644
--- a/TAO/tests/Collocated_DerivedIF/Test.idl
+++ b/TAO/tests/Collocated_DerivedIF/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// Put the interfaces in a module, to avoid global namespace pollution
module Test
{
diff --git a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
index 55cd8c54a5a..55fbb4f1066 100644
--- a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
+++ b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags += -Gd -Sorb
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
index ea9486a45f6..2bc503b80c1 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
index b6aaa094286..082deef36ee 100644
--- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
index 784f8b14f8b..548f1027c09 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/PI_Server/PI_Server.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
index 8d40f494b20..78116481ce8 100644
--- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp
index 0fbf6222830..5947960f668 100644
--- a/TAO/tests/Collocated_Forwarding/server.cpp
+++ b/TAO/tests/Collocated_Forwarding/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp
index fb70256f103..a2f0451bd10 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.cpp
+++ b/TAO/tests/Collocated_Forwarding/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
#include "test_i.h"
diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h
index e261a71ef2f..847217953d8 100644
--- a/TAO/tests/Collocated_Forwarding/test_i.h
+++ b/TAO/tests/Collocated_Forwarding/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TEST_I_H
#define TEST_I_H
diff --git a/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc b/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
index 8edb4eea37c..c4af8832797 100644
--- a/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
+++ b/TAO/tests/Collocated_NoColl/Collocated_NoColl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Thru_Pu is default enabled
project(Collocated_NoColl): taoserver {
exename = Collocated_NoColl
diff --git a/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc b/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
index 86c10ace774..524cf6cc9b4 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
+++ b/TAO/tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable THRU_POA Collocation
project(Collocated_ThruP_Sp): taoserver {
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
index a5b5b6fdf8e..7a3400701d4 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// Disable THRU_POA Collocation, enable Direct Collocation
project(Coll_ThruP_Sp-Gd): taoserver {
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index 8c5a05ae53f..0859f15b87c 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index 989197459ec..6ef4abe76e8 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Wb,skel_export_macro=Diamond_Export \
-Wb,stub_export_macro=MY_Stub_Export \
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 8d831127fc2..fd7e27de07d 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Collocation/Diamond.idl b/TAO/tests/Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/Collocation/Diamond.idl
+++ b/TAO/tests/Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 0200835d0a8..76500e00431 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index d8801332823..2b81c1c5906 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/Collocation/diamond_export.h b/TAO/tests/Collocation/diamond_export.h
index fff24d8a0e5..78ba933286c 100644
--- a/TAO/tests/Collocation/diamond_export.h
+++ b/TAO/tests/Collocation/diamond_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/Collocation/stub_export.h b/TAO/tests/Collocation/stub_export.h
index 2242f4a184e..ca0093d192c 100644
--- a/TAO/tests/Collocation/stub_export.h
+++ b/TAO/tests/Collocation/stub_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl
index fe65905edb6..c4d2df0c040 100644
--- a/TAO/tests/CollocationLockup/AB.idl
+++ b/TAO/tests/CollocationLockup/AB.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A {
};
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index f3095a294db..b71122bc23b 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* CollocationLockup.cpp
* This is regression test against bug #2130.
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.mpc b/TAO/tests/CollocationLockup/CollocationLockup.mpc
index a5b1b48cfd6..aa84216fdc7 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.mpc
+++ b/TAO/tests/CollocationLockup/CollocationLockup.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
AB.idl
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index aab58a55d1e..97aab729a41 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/**
* SimpleNamingService.cpp
* This is part of the regression test against bug #2130.
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.idl b/TAO/tests/CollocationLockup/SimpleNamingService.idl
index e76b077308f..78ebf9b82b8 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.idl
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.idl
@@ -1,5 +1,3 @@
-// $Id$
-
/// This is a degenerate Naming Service that only binds one object
interface SimpleNamingService {
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
index b04daa281e7..29625fa56fa 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Exception_Test/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_Exception_Test/Collocation_Excep_Test.mpc b/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
index c674fbac67e..fbe453018e1 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
+++ b/TAO/tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver {
exename = Collocated_Test
}
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index d1192e1964c..57680cb8ed3 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index ee2e5374ba8..e95f9c20d58 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_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/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc b/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
index 9f61292233d..dbd371f0d00 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*): taoserver, messaging, valuetype {
exename = Collocated_Test
}
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index b65594affff..0f8e79e67e2 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Task.h"
#include "tao/PortableServer/Object_Adapter.h"
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
index 244a8cc2c48..a119c2bc77b 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Collocation Opportunities): taoserver, avoids_corba_e_micro {
exename = Collocation_Opportunities
}
diff --git a/TAO/tests/Collocation_Tests/Collocation_Tests.mpc b/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
index a3b38d9513d..00c5ceec419 100644
--- a/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
+++ b/TAO/tests/Collocation_Tests/Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Collocation_Tests): taoserver {
exename = Collocated_Test
}
diff --git a/TAO/tests/Compression/Compression_Test.mpc b/TAO/tests/Compression/Compression_Test.mpc
index f2ba78e695d..30324a09661 100644
--- a/TAO/tests/Compression/Compression_Test.mpc
+++ b/TAO/tests/Compression/Compression_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Zlib_Server): taoserver, compression, zlibcompressor, {
exename = zlibserver
Source_Files {
diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp
index 4fe39e87049..930106809cb 100644
--- a/TAO/tests/Compression/RLECompressorTest.cpp
+++ b/TAO/tests/Compression/RLECompressorTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "ace/High_Res_Timer.h"
#include "ace/Compression/rle/RLECompressor.h"
diff --git a/TAO/tests/Compression/bzip2server.cpp b/TAO/tests/Compression/bzip2server.cpp
index ff76d1b43a5..a9e938e9283 100644
--- a/TAO/tests/Compression/bzip2server.cpp
+++ b/TAO/tests/Compression/bzip2server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Compression/lzoserver.cpp b/TAO/tests/Compression/lzoserver.cpp
index 767aa44933d..626462f419c 100644
--- a/TAO/tests/Compression/lzoserver.cpp
+++ b/TAO/tests/Compression/lzoserver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Compression/zlibserver.cpp b/TAO/tests/Compression/zlibserver.cpp
index e6f69de9958..02f9add34ef 100644
--- a/TAO/tests/Compression/zlibserver.cpp
+++ b/TAO/tests/Compression/zlibserver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 899a542fef2..944cc8de6d6 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 91d939dd38e..e89faed032e 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Connection_Failure/Connection_Failure.mpc b/TAO/tests/Connection_Failure/Connection_Failure.mpc
index 2e1ace5ef7a..32775bd0891 100644
--- a/TAO/tests/Connection_Failure/Connection_Failure.mpc
+++ b/TAO/tests/Connection_Failure/Connection_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client): taoclient {
Source_Files {
testC.cpp
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index 3f7bb372923..38658ec1661 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 5a45cca020f..6bedb983d57 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index a9e2ea6951b..eef190eeaa0 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index dbc357a6378..f39194018c4 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Connection_Purging/test.idl b/TAO/tests/Connection_Purging/test.idl
index c5d7b77a2e1..7c5dec9cd92 100644
--- a/TAO/tests/Connection_Purging/test.idl
+++ b/TAO/tests/Connection_Purging/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void send_stuff(in string foo);
diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
index 9d58f4e8439..766e8f73564 100644
--- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
+++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client): taoserver, messaging {
exename = client
avoids += ace_for_tao
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 23465cdc223..c0a0e8389d8 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 278271d77ca..2be69848770 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 6ffabbd27a2..6d3b85d08fb 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 8863e07603f..5d730cba5bd 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Receiver.h"
#include "Crash_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index f628c6296ee..d2e5d52f801 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 33b5e775ea0..ba0ad2c43d0 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Crashed_Callback.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 2c74b294c77..a56060e900c 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
index 82d60fb0298..738235a547b 100644
--- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
+++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
index 18ac4d8cc04..28fb21e55bb 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/oneway/DII_Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*oneway) : taoserver, dynamicinterface, avoids_minimum_corba{
exename = Collocated_Test
}
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
index 931635159a9..bda42366831 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
+++ b/TAO/tests/DII_Collocation_Tests/twoway/DII_Collocation_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*twoway) : taoserver, dynamicinterface, avoids_minimum_corba{
exename = Collocated_Test
}
diff --git a/TAO/tests/DIOP/Basic.mpc b/TAO/tests/DIOP/Basic.mpc
index 2f93ff5421e..99c50e7a9ba 100644
--- a/TAO/tests/DIOP/Basic.mpc
+++ b/TAO/tests/DIOP/Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags += -Sp -Sd
diff --git a/TAO/tests/DIOP/UDP.idl b/TAO/tests/DIOP/UDP.idl
index 3f1ebe8221a..e9597f24639 100644
--- a/TAO/tests/DIOP/UDP.idl
+++ b/TAO/tests/DIOP/UDP.idl
@@ -1,7 +1,5 @@
/* -*- C++ -*- */
// UDP.idl
-// $Id$
-
interface UDP
{
// = TITLE
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index 37c46dc90c8..ec477c40297 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_Client_i.h"
#include "ace/SString.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp
index 4c33ad2c521..9e4598bdb3c 100644
--- a/TAO/tests/DIOP/UDP_i.cpp
+++ b/TAO/tests/DIOP/UDP_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "UDP_i.h"
// Constructor
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index fd5b6235a85..5c2f8dba9f6 100644
--- a/TAO/tests/DLL_ORB/DLL_ORB.mpc
+++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 83f4d56e852..8d54d570503 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_Client_Module.h"
#include "tao/TAO_Singleton_Manager.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module_Export.h b/TAO/tests/DLL_ORB/Test_Client_Module_Export.h
index 5e53f353d4e..17560a5fa31 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module_Export.h
+++ b/TAO/tests/DLL_ORB/Test_Client_Module_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 6f6702697e3..260efda2744 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_Server_Module.h"
#include "tao/TAO_Singleton_Manager.h"
#include "tao/StringSeqC.h"
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module_Export.h b/TAO/tests/DLL_ORB/Test_Server_Module_Export.h
index 1b3a24f667e..cb6fed9abaf 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module_Export.h
+++ b/TAO/tests/DLL_ORB/Test_Server_Module_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index be88b80cb16..88e93855c0d 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Test_i.h"
Test_i::Test_i (void)
diff --git a/TAO/tests/DSI_AMH/DSI_AMH.mpc b/TAO/tests/DSI_AMH/DSI_AMH.mpc
index 648b79506e9..42a30de7b4e 100644
--- a/TAO/tests/DSI_AMH/DSI_AMH.mpc
+++ b/TAO/tests/DSI_AMH/DSI_AMH.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp
index ef0384b966d..74f23dad92b 100644
--- a/TAO/tests/DSI_AMH/client.cpp
+++ b/TAO/tests/DSI_AMH/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp
index 85caa9c72c1..a52236a4c9f 100644
--- a/TAO/tests/DSI_AMH/server.cpp
+++ b/TAO/tests/DSI_AMH/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
index 3d1791f4ea1..ee3ab6223de 100644
--- a/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
+++ b/TAO/tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
index 2b6331ab8e5..5bff677eb76 100644
--- a/TAO/tests/DSI_AMI_Gateway/client.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/gateway.cpp b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
index 0bd127fc870..3fa496dd2dd 100644
--- a/TAO/tests/DSI_AMI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp
index 1e520c7ff9a..6bf1effcc77 100644
--- a/TAO/tests/DSI_AMI_Gateway/server.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
index 5ac9d1ac72d..fae8cacfd73 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/Unknown_User_Exception.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.inl b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
index 16ff803a4a9..e55cd67b013 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
DSI_Simple_Server::DSI_Simple_Server (
CORBA::ORB_ptr orb,
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
index 34ec0538137..24445c85741 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.inl b/TAO/tests/DSI_AMI_Gateway/test_i.inl
index bd51e3a42bd..4865283b255 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_AMI_Gateway/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index f59b20036bd..d80ed416806 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index e579139a181..aac67ece8cf 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 7f64bfc18b3..b01333ddcc3 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 1e520c7ff9a..6bf1effcc77 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 59b695330f6..1ab1810fd52 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_dsi.h"
#include "tao/DynamicInterface/Request.h"
#include "tao/DynamicInterface/Unknown_User_Exception.h"
diff --git a/TAO/tests/DSI_Gateway/test_dsi.inl b/TAO/tests/DSI_Gateway/test_dsi.inl
index dab987ec71e..e53aa9faa59 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.inl
+++ b/TAO/tests/DSI_Gateway/test_dsi.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
DSI_Simple_Server::DSI_Simple_Server (CORBA::ORB_ptr orb,
CORBA::Object_ptr target,//Simple_Server_ptr target,
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 34ec0538137..24445c85741 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/DSI_Gateway/test_i.inl b/TAO/tests/DSI_Gateway/test_i.inl
index bd51e3a42bd..4865283b255 100644
--- a/TAO/tests/DSI_Gateway/test_i.inl
+++ b/TAO/tests/DSI_Gateway/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp
index d14c203c8c1..4815a0b538e 100644
--- a/TAO/tests/DiffServ/client.cpp
+++ b/TAO/tests/DiffServ/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/Policy_Manager.h"
diff --git a/TAO/tests/DiffServ/diffserv.mpc b/TAO/tests/DiffServ/diffserv.mpc
index 43e99e0da2c..65884d183e2 100644
--- a/TAO/tests/DiffServ/diffserv.mpc
+++ b/TAO/tests/DiffServ/diffserv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 7ccc9177032..778d72a4351 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/DynAny_Test/DynAny_Test.mpc b/TAO/tests/DynAny_Test/DynAny_Test.mpc
index 8b40435f308..4e6da93be9a 100644
--- a/TAO/tests/DynAny_Test/DynAny_Test.mpc
+++ b/TAO/tests/DynAny_Test/DynAny_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Basic): taoserver, dynamicany {
exename = basic_test
diff --git a/TAO/tests/DynUnion_Test/DynUnionTest.cpp b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
index 27b92aa8960..b2b8b06a7dd 100644
--- a/TAO/tests/DynUnion_Test/DynUnionTest.cpp
+++ b/TAO/tests/DynUnion_Test/DynUnionTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "dynanyC.h"
#include "tao/DynamicAny/DynamicAny.h"
#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
diff --git a/TAO/tests/DynUnion_Test/dynany.idl b/TAO/tests/DynUnion_Test/dynany.idl
index bd245a5fcf0..96ad4b3bf74 100644
--- a/TAO/tests/DynUnion_Test/dynany.idl
+++ b/TAO/tests/DynUnion_Test/dynany.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module DynAnyTest {
enum EventKind {ALARM_EVENT, LOG_EVENT};
diff --git a/TAO/tests/DynUnion_Test/dynunion_test.mpc b/TAO/tests/DynUnion_Test/dynunion_test.mpc
index 9df25fa2b3b..3adca779bda 100644
--- a/TAO/tests/DynUnion_Test/dynunion_test.mpc
+++ b/TAO/tests/DynUnion_Test/dynunion_test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): dynamicany {
IDL_Files {
dynany.idl
diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp
index f248b6d8165..02ec090d294 100644
--- a/TAO/tests/DynValue_Test/Analyzer.cpp
+++ b/TAO/tests/DynValue_Test/Analyzer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Analyzer.h"
#include "tao/DynamicAny/DynCommon.h"
diff --git a/TAO/tests/DynValue_Test/Analyzer.h b/TAO/tests/DynValue_Test/Analyzer.h
index c40fcf876fb..961d7821677 100644
--- a/TAO/tests/DynValue_Test/Analyzer.h
+++ b/TAO/tests/DynValue_Test/Analyzer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INCLUDE_ANALYZER_H
#define INCLUDE_ANALYZER_H
diff --git a/TAO/tests/DynValue_Test/DynValue_Test.idl b/TAO/tests/DynValue_Test/DynValue_Test.idl
index 185aadab761..119070972ec 100644
--- a/TAO/tests/DynValue_Test/DynValue_Test.idl
+++ b/TAO/tests/DynValue_Test/DynValue_Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module DynValue_Test
{
abstract valuetype avt
diff --git a/TAO/tests/DynValue_Test/DynValue_Test.mpc b/TAO/tests/DynValue_Test/DynValue_Test.mpc
index 64b6c55fa37..9bf2d3f07dc 100644
--- a/TAO/tests/DynValue_Test/DynValue_Test.mpc
+++ b/TAO/tests/DynValue_Test/DynValue_Test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): dynamicany {
IDL_Files {
DynValue_Test.idl
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.cpp b/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
index d8fca9ed7dd..a170a4278f3 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ValueTypes_impl.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.h b/TAO/tests/DynValue_Test/ValueTypes_impl.h
index 573aafb54b0..25bd32b1323 100644
--- a/TAO/tests/DynValue_Test/ValueTypes_impl.h
+++ b/TAO/tests/DynValue_Test/ValueTypes_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef INCLUDE_VALUETYPE_IMPL_H
#define INCLUDE_VALUETYPE_IMPL_H
diff --git a/TAO/tests/DynValue_Test/main.cpp b/TAO/tests/DynValue_Test/main.cpp
index 1f08866b2d0..408225d408f 100644
--- a/TAO/tests/DynValue_Test/main.cpp
+++ b/TAO/tests/DynValue_Test/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Analyzer.h"
//============= Test main() ============
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
index 72e41407555..36fa2ec6a89 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Config_Loader.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro, threads {
exename = test
}
diff --git a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
index c568378f49d..c0c04461ecc 100644
--- a/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/Config_Loader/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_Config.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Service_Config.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
index ff8b42ea470..689c1446bd9 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
index 55f904e7488..8f2b3147a86 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Middle.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
index c7dbc16435e..a4390483074 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/ORB_ThreadPool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
index 5a74d7a3cd8..7fb3d8daf0c 100644
--- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
+++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
index 7c4fa704639..d9a2b265c54 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Dynamic_TP_POA_Test_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro, threads {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
index b9b61436a4f..d658510f4e1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
index 6aae090018f..45040fd3c7f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
index f5443b2ff36..7987796f853 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Dynamic_TP_POA_Test_Static.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Dynamic_TP_POA_Test_Static_idl): taoidldefaults, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
index b9b61436a4f..d658510f4e1 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index e75d885f7b9..387d7b39413 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "tao/Dynamic_TP/DTP_POA_Loader.h"
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
index 67608a907eb..87e93601546 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
+++ b/TAO/tests/Dynamic_TP/POA_Loader/POA_Loader.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*test) : dynamic_tp, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
}
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
index 1b8e947b70e..9ebe6503e00 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Dynamic_TP/DTP_POA_Strategy.h"
#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 6dd9084f5ad..69771325bb1 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
time.idl
diff --git a/TAO/tests/Explicit_Event_Loop/time.idl b/TAO/tests/Explicit_Event_Loop/time.idl
index 827ea4c527d..32bb310b4aa 100644
--- a/TAO/tests/Explicit_Event_Loop/time.idl
+++ b/TAO/tests/Explicit_Event_Loop/time.idl
@@ -1,6 +1,4 @@
-// $Id$
-
struct TimeOfDay {
short hour; // 0 - 23
short minute; // 0 - 59
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 780cb0f5cb8..d205fc13389 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Counter.idl
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index f49887a77b8..231982ae857 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- App. Specific Include --
#include "Policy_Tester.h"
#include "RT_Properties.h"
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 0fdb414c1c1..81c07d0e08c 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Policy_Verifier.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index dddf5c131c4..5b0942d2b47 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// -- App. Specific Include --
#include "CounterC.h"
// #include "util.h"
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index 9f8856707ff..6d0e126775c 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*client) : taoclient, portableserver, tao_flresource {
source_files {
client.cpp
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 4c3c82b1eda..2e3088390d6 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/FlResource/FlResource_Loader.h"
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 8887b07b328..83f74fac289 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/FlResource/FlResource_Loader.h"
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 2a9e6954f04..14fc41808d6 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include <GL/gl.h>
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 4ede4b6893f..68d1d2ba7d4 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d8d2d54cc08..ec32b46fa2a 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 7f1aa5fd6d9..889f297e491 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index 14219aae5fb..ae6a6a137d3 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ping_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Faults/ping.idl b/TAO/tests/Faults/ping.idl
index e52c5776d28..afddd89f20a 100644
--- a/TAO/tests/Faults/ping.idl
+++ b/TAO/tests/Faults/ping.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface PingObject
{
// = DESCRIPTION
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 17462fd4fc4..2fed44d1079 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Faults/ping_i.inl b/TAO/tests/Faults/ping_i.inl
index 6444139ea3c..38515dd085d 100644
--- a/TAO/tests/Faults/ping_i.inl
+++ b/TAO/tests/Faults/ping_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
PingObject_i::PingObject_i (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa)
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 580fa5b624f..cdbc5dec585 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 03c87f5762a..14b151a399d 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index c7046eac7a7..449e6db1780 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Faults/test_i.inl b/TAO/tests/Faults/test_i.inl
index 63f454c670b..fde2b8f5d61 100644
--- a/TAO/tests/Faults/test_i.inl
+++ b/TAO/tests/Faults/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 3651047c5eb..17f64555f01 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
File.idl
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index d358a3ffbc4..ce2a1d2b538 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "File_i.h"
#include "tao/debug.h"
#include "ace/SString.h"
diff --git a/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc b/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
+++ b/TAO/tests/ForwardOnceUponException/ForwardOnceUponException.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 5d3e11e6777..4d744d68c2a 100755
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/ForwardOnceUponException/server.cpp b/TAO/tests/ForwardOnceUponException/server.cpp
index cde9adfca59..56e31ae6a71 100755
--- a/TAO/tests/ForwardOnceUponException/server.cpp
+++ b/TAO/tests/ForwardOnceUponException/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ForwardOnceUponException/test.idl b/TAO/tests/ForwardOnceUponException/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/ForwardOnceUponException/test.idl
+++ b/TAO/tests/ForwardOnceUponException/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp
index e139a027d6c..c94f6f039f9 100755
--- a/TAO/tests/ForwardOnceUponException/test_i.cpp
+++ b/TAO/tests/ForwardOnceUponException/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/ForwardOnceUponException/test_i.inl b/TAO/tests/ForwardOnceUponException/test_i.inl
index f31987e49d7..41ff942499f 100755
--- a/TAO/tests/ForwardOnceUponException/test_i.inl
+++ b/TAO/tests/ForwardOnceUponException/test_i.inl
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/Invocation_Utils.h"
ACE_INLINE
diff --git a/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc b/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
+++ b/TAO/tests/ForwardUponObjectNotExist/ForwardUponObjectNotExist.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index 33a50754c6d..3e4948b7c89 100755
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/ForwardUponObjectNotExist/server.cpp b/TAO/tests/ForwardUponObjectNotExist/server.cpp
index 133182484f3..e9a267ec27b 100755
--- a/TAO/tests/ForwardUponObjectNotExist/server.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ForwardUponObjectNotExist/test.idl b/TAO/tests/ForwardUponObjectNotExist/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test.idl
+++ b/TAO/tests/ForwardUponObjectNotExist/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
index bc33c618f74..4e447fad05e 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.inl b/TAO/tests/ForwardUponObjectNotExist/test_i.inl
index 97524552ff4..9357ec5d99c 100755
--- a/TAO/tests/ForwardUponObjectNotExist/test_i.inl
+++ b/TAO/tests/ForwardUponObjectNotExist/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index ee705f01845..a158bbdf7cd 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index bfd91f357d5..d4037881831 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 7abc09e549a..434cb332d0f 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Forwarding/test.idl b/TAO/tests/Forwarding/test.idl
index b9aa7108ed3..98cde9d77b1 100644
--- a/TAO/tests/Forwarding/test.idl
+++ b/TAO/tests/Forwarding/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index 4c2a71f0302..2b0a449a165 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Forwarding/test_i.inl b/TAO/tests/Forwarding/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Forwarding/test_i.inl
+++ b/TAO/tests/Forwarding/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
index 693db9d11bc..f95c7c66a4d 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Java_Big_Reply.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) {
requires += java
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index 2edab1ba7d7..874a19dddc8 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc b/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
index 3c081fa6da4..1072daa2e9b 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Java_Big_Request.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) {
requires += java
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 127a41292a1..687b2096ddd 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
index 567e50ee4f5..2e3ef6e7c46 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_corba_e_micro {
}
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 8c5e4caddff..db3aa9c564d 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Payload_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/HandleExhaustion/HandleExhaustion.mpc b/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
index 5718c68b775..cf92affbc70 100644
--- a/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
+++ b/TAO/tests/HandleExhaustion/HandleExhaustion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/HandleExhaustion/Test.idl b/TAO/tests/HandleExhaustion/Test.idl
index 1406633df03..0791a7a2c9a 100644
--- a/TAO/tests/HandleExhaustion/Test.idl
+++ b/TAO/tests/HandleExhaustion/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void simple ();
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index 1f0d6280a75..827ee12269b 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp
index 042a7eef7a9..80d96c756be 100644
--- a/TAO/tests/HandleExhaustion/server.cpp
+++ b/TAO/tests/HandleExhaustion/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
#include "ace/Handle_Set.h"
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index 60a67b14c88..fc1d55d0f26 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Hang_Shutdown/Test.idl b/TAO/tests/Hang_Shutdown/Test.idl
index 0ea5055f05a..4b31340f9e0 100644
--- a/TAO/tests/Hang_Shutdown/Test.idl
+++ b/TAO/tests/Hang_Shutdown/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Hang
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index b9a6d27a1fb..d5f0e3a45c2 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index aed5b6d77dc..03193adec64 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index df49d37a507..733fe2bfcaf 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index fbab84719e4..ba03cd558e5 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 1bb3e718137..db10fc575b3 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 205a7c179e0..128457baeb9 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index 11b1b561a3a..258760f6202 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ICMG_Any_Bug_Hello_IDL): taoidldefaults {
idlflags -= -St
idlflags -= -Sa
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 04ee037423f..27117435628 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/DynamicInterface/Request.h"
#include "TestC.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index aea9277fb44..c2749ef789c 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
index 40f1c93b523..ad62372bfaa 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
InheritedOp.idl
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
index 1fdf64ad83d..1b8bcc27184 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOp_i.h"
Derived_i::Derived_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
index efc430f3851..d64d6370536 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef INHERITED_OP_I_H
#define INHERITED_OP_I_H
diff --git a/TAO/tests/IDL_Inherited_Operation/client.cpp b/TAO/tests/IDL_Inherited_Operation/client.cpp
index 23a55737151..e7c8ad46380 100644
--- a/TAO/tests/IDL_Inherited_Operation/client.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOpC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/IDL_Inherited_Operation/server.cpp b/TAO/tests/IDL_Inherited_Operation/server.cpp
index ae20f1251a1..96989d9c1c1 100644
--- a/TAO/tests/IDL_Inherited_Operation/server.cpp
+++ b/TAO/tests/IDL_Inherited_Operation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "InheritedOp_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/IDL_Test/Bug_2350_Regression.idl b/TAO/tests/IDL_Test/Bug_2350_Regression.idl
index 1a24b054a21..9e9836ac7a4 100644
--- a/TAO/tests/IDL_Test/Bug_2350_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2350_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
exception something
{
};
diff --git a/TAO/tests/IDL_Test/Bug_2577_Regression.idl b/TAO/tests/IDL_Test/Bug_2577_Regression.idl
index 9b7b9ffa3af..1175c3f446f 100644
--- a/TAO/tests/IDL_Test/Bug_2577_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2577_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2577
struct DateTime_T
diff --git a/TAO/tests/IDL_Test/Bug_2582_Regression.idl b/TAO/tests/IDL_Test/Bug_2582_Regression.idl
index 9eacd797660..27e81c3d0d9 100644
--- a/TAO/tests/IDL_Test/Bug_2582_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2582_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2582
enum EncodingID_T
diff --git a/TAO/tests/IDL_Test/Bug_2583_Regression.idl b/TAO/tests/IDL_Test/Bug_2583_Regression.idl
index e524981b54c..2bd64076c5a 100644
--- a/TAO/tests/IDL_Test/Bug_2583_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2583_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2583
module Test {
diff --git a/TAO/tests/IDL_Test/Bug_2616_Regression.idl b/TAO/tests/IDL_Test/Bug_2616_Regression.idl
index 916d4db404e..7906cf11f8f 100644
--- a/TAO/tests/IDL_Test/Bug_2616_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2616_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2616
struct AA
diff --git a/TAO/tests/IDL_Test/Bug_2619_Regression.idl b/TAO/tests/IDL_Test/Bug_2619_Regression.idl
index 4d95f523a0e..223c77a33cd 100644
--- a/TAO/tests/IDL_Test/Bug_2619_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_2619_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 2619
struct Type_T
diff --git a/TAO/tests/IDL_Test/Bug_3243_Regression.idl b/TAO/tests/IDL_Test/Bug_3243_Regression.idl
index ddc61040a8e..17308963efb 100644
--- a/TAO/tests/IDL_Test/Bug_3243_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3243_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test Bug 3243
const long long NptNow = 0x80000000;
diff --git a/TAO/tests/IDL_Test/Bug_3312_Regression.idl b/TAO/tests/IDL_Test/Bug_3312_Regression.idl
index 25c96b4ac7e..3d1e480b534 100644
--- a/TAO/tests/IDL_Test/Bug_3312_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3312_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module CallMe
{
enum Colors { Red, Green, Blue };
diff --git a/TAO/tests/IDL_Test/Bug_3819_Regression.idl b/TAO/tests/IDL_Test/Bug_3819_Regression.idl
index f5eff4a043f..3b0a15676e7 100644
--- a/TAO/tests/IDL_Test/Bug_3819_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3819_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module orange {
module apple {
valuetype Foo;
diff --git a/TAO/tests/IDL_Test/Bug_3821_Regression.idl b/TAO/tests/IDL_Test/Bug_3821_Regression.idl
index fb1fd5a0f07..bd10ab38ec2 100644
--- a/TAO/tests/IDL_Test/Bug_3821_Regression.idl
+++ b/TAO/tests/IDL_Test/Bug_3821_Regression.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module test {
enum Enumeration {
Enum1,
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index dc063f9f1e1..7f439bb428c 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoserver, messaging, gen_ostream {
custom_only=1
idlflags += -GC -GH -Gd -GT
diff --git a/TAO/tests/IDL_Test/PEMNaming.idl b/TAO/tests/IDL_Test/PEMNaming.idl
index 9248319643c..d90a10c0f86 100644
--- a/TAO/tests/IDL_Test/PEMNaming.idl
+++ b/TAO/tests/IDL_Test/PEMNaming.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _PEM_NAMING_IDL_
#define _PEM_NAMING_IDL_
diff --git a/TAO/tests/IDL_Test/attribute.idl b/TAO/tests/IDL_Test/attribute.idl
index 9762b92bed7..79ed7a197f6 100644
--- a/TAO/tests/IDL_Test/attribute.idl
+++ b/TAO/tests/IDL_Test/attribute.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Hello
{
exception InternalErrorA
diff --git a/TAO/tests/IDL_Test/loader_const.idl b/TAO/tests/IDL_Test/loader_const.idl
index 5eee3b0d563..2156a437eef 100644
--- a/TAO/tests/IDL_Test/loader_const.idl
+++ b/TAO/tests/IDL_Test/loader_const.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _LOADER_CONST_IDL_
#define _LOADER_CONST_IDL_
diff --git a/TAO/tests/IDL_Test/struct.idl b/TAO/tests/IDL_Test/struct.idl
index ad06f2f5134..bd80df37061 100644
--- a/TAO/tests/IDL_Test/struct.idl
+++ b/TAO/tests/IDL_Test/struct.idl
@@ -1,4 +1,3 @@
-// $Id$
// Double forward declared struct test, created by Martin Corino <mcorino@remedy.nl>
module Test
diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl
index 67e4d1ac709..5fb34afb825 100644
--- a/TAO/tests/IDL_Test/typeprefix.idl
+++ b/TAO/tests/IDL_Test/typeprefix.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Test a construct with typeprefix which failed when TAO_IDL was build
// with Intel C++ or Sun C++
diff --git a/TAO/tests/IORManipulation/IORManipulation.mpc b/TAO/tests/IORManipulation/IORManipulation.mpc
index cdc8ea5c99f..b0143a8dcb8 100644
--- a/TAO/tests/IORManipulation/IORManipulation.mpc
+++ b/TAO/tests/IORManipulation/IORManipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IORTest) : taoexe, iormanip {
exename = IORTest
}
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 9bd530cdd3f..b6fe2c1e473 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//========================================================================
/**
* @file IORTest.cpp
diff --git a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
index 93ca0316852..4af54009d91 100644
--- a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
+++ b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, iormanip {
}
diff --git a/TAO/tests/IORManipulation/filter/Test.idl b/TAO/tests/IORManipulation/filter/Test.idl
index 922ccde863b..4353118b3ae 100644
--- a/TAO/tests/IORManipulation/filter/Test.idl
+++ b/TAO/tests/IORManipulation/filter/Test.idl
@@ -1,4 +1,3 @@
-// $Id$
module Test
{
interface Hello
diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp
index 49fb18bdf7e..99f4062fd55 100644
--- a/TAO/tests/IORManipulation/filter/server.cpp
+++ b/TAO/tests/IORManipulation/filter/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/IORManipulation/IORManip_IIOP_Filter.h"
#include "tao/Stub.h"
diff --git a/TAO/tests/IORTable_Locator/Test.mpc b/TAO/tests/IORTable_Locator/Test.mpc
index 730fdbd2166..d0c82cbe90a 100644
--- a/TAO/tests/IORTable_Locator/Test.mpc
+++ b/TAO/tests/IORTable_Locator/Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IORTable_Locator_idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp
index 73757fdd503..9c7f7d49b39 100644
--- a/TAO/tests/IORTable_Locator/async_server.cpp
+++ b/TAO/tests/IORTable_Locator/async_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/tests/IORTable_Locator/client.cpp b/TAO/tests/IORTable_Locator/client.cpp
index aa26c31770b..d5ace201f77 100644
--- a/TAO/tests/IORTable_Locator/client.cpp
+++ b/TAO/tests/IORTable_Locator/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/IORTable_Locator/server.cpp b/TAO/tests/IORTable_Locator/server.cpp
index 977e38eb068..0cc4dd853d3 100644
--- a/TAO/tests/IORTable_Locator/server.cpp
+++ b/TAO/tests/IORTable_Locator/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/IORTable_Locator/simple_test.idl b/TAO/tests/IORTable_Locator/simple_test.idl
index 308e9420436..11cce4bbd8f 100644
--- a/TAO/tests/IORTable_Locator/simple_test.idl
+++ b/TAO/tests/IORTable_Locator/simple_test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SIMPLE_TEST_
#define _SIMPLE_TEST_
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index b4039bb8ddc..12f9468712a 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bogus_i.h"
bogus::bogus()
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index cd941841865..f906c35dec6 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
// Extract the address for each network interface using EXACTLY
// the same algorithm as TAO_IIOP_Acceptor, and then print
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 2e4131f6280..fc2a86b7fe3 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index 8ab32ee47c3..6d39358d5aa 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/SString.h"
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 0a6decbfecd..ee9cc39c811 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "INS_i.h"
// Constructor
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index dbb42b3c982..c4398122adc 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "INSC.h"
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index 12310027192..d8b6c0fc962 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_i.h"
#include "INS_i.h"
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 515a689a52b..06a381b1690 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
INS.idl
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index 53c406090c3..86f872883af 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index ccc53a35c99..8416a589990 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "test_i.h"
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index b1e87f1c15a..99ec0e52d94 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h
index a55696312b0..5c667cee8c3 100644
--- a/TAO/tests/LongDouble/Global.h
+++ b/TAO/tests/LongDouble/Global.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_TEST_GLOBAL_H
#define TAO_TEST_GLOBAL_H
diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp
index 8544f922c22..3a342d612ca 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.cpp
+++ b/TAO/tests/LongDouble/LongDoubleTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LongDoubleTest.h"
#include "Global.h"
diff --git a/TAO/tests/LongDouble/LongDoubleTest.mpc b/TAO/tests/LongDouble/LongDoubleTest.mpc
index fd1a8ea4dfc..4789a0deb2e 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.mpc
+++ b/TAO/tests/LongDouble/LongDoubleTest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
index 02fdbebed49..ba0b6363794 100644
--- a/TAO/tests/LongDouble/client.cpp
+++ b/TAO/tests/LongDouble/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "Global.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
index 078a6750c43..4e7ac85131c 100644
--- a/TAO/tests/LongDouble/server.cpp
+++ b/TAO/tests/LongDouble/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LongDoubleTest.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 604ae849cf7..79e9f35ef42 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LONGUPCALLS_AMI_MANAGER_H
#define LONGUPCALLS_AMI_MANAGER_H
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 21e23995b76..5957473e7e4 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef LONGUPCALLS_CONTROLLER_H
#define LONGUPCALLS_CONTROLLER_H
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 8a242f6938c..a94a613dd27 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/LongUpcalls/Test.idl b/TAO/tests/LongUpcalls/Test.idl
index 047bd3bde5f..8c0c018e358 100644
--- a/TAO/tests/LongUpcalls/Test.idl
+++ b/TAO/tests/LongUpcalls/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test
{
interface Controller {
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index b5f1efc52a2..2d6e7732715 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Controller.h"
#include "Manager_Handler.h"
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 94164a1eb6a..9d1c223557b 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "AMI_Manager.h"
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index ceb750ed3b3..38ad1df82b6 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Controller.h"
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 128c91f59f1..a024de4d280 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Manager.h"
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 7beef1c3cfa..9aa43fe43bb 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, iormanip {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index f3f1dfeb84d..bd620441e42 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IORManipulation/IORManip_Loader.h"
#include "ace/SString.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index fa3c1874c6e..7ec816c36bb 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index 9c6d464b6ab..0c72e85ca20 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index b8f58d81ffd..07638a44228 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index df2e469c5f1..c53a5b09e68 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IORManipulation/IORManip_Loader.h"
#include "ace/SString.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 3fa9c78bea4..cecca0ee717 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index c9666c5d7ab..aace20bd464 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
// part of the famous caesium 133 atom transition for a
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index 5625f1183bf..9a339306a2b 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 7d255007aa8..336242aaf5d 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/SString.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 405a6eca91a..5517ecf0093 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 65291139aa8..c13b1242623 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/MProfile_Forwarding/test_i.inl b/TAO/tests/MProfile_Forwarding/test_i.inl
index b11bb431e1f..ce98e245ca7 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.inl
+++ b/TAO/tests/MProfile_Forwarding/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index b9de35dbb68..38fbc74381a 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 35f2360528c..00b43a9ed7d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "ace/Manual_Event.h"
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index abf16e115a9..b01992447ee 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Receiver_i.h"
#include "SenderC.h"
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 043ed95d566..ce5b925c9e8 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Sender_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index b221f62ce4b..c5b269f3edc 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index a717f92b9f7..c4aef141512 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 0c1b9ff0d51..44ed8590e59 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index cc915920a38..3100cffb926 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 3d7090b6bb2..52f50251cf2 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/MT_Client/test_i.inl b/TAO/tests/MT_Client/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/MT_Client/test_i.inl
+++ b/TAO/tests/MT_Client/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc b/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
index a11e11f20a6..ebb9a8e0683 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
index 0081a42b4d0..39da6d24fd8 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Idl {
interface SharedIntf {
void ping();
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
index 4fcaa2aae6c..d0580eec270 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Log_Priority.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
index 3926689bcd1..1eca1fcea5e 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAREDINTF_I_H_
#define SHAREDINTF_I_H_
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
index b29c1e9bfc1..5c89d60360a 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
index 576a4419ea8..a9e31f4e0f5 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined( CHATTER_H)
#define CHATTER_H
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
index 9d2dde85f95..b5595adf0eb 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
index 852ccd952f1..0c198804856 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/police.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_stat.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/police.h b/TAO/tests/MT_NoUpcall_Client_Leader/police.h
index af3144b1292..1f9703beb19 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/police.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/police.h
@@ -1,3 +1 @@
-// $Id$
-
void poll (const char* filename);
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
index e2479ce29fd..464e8c2494b 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "worker.h"
#include "chatter.h"
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
index 5c5041b6418..c9d1484a04b 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "worker.h"
Worker::Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
index 55146024151..aa0244e0e21 100644
--- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
+++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined( WORKER_H)
#define WORKER_H
diff --git a/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc b/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
index d9b5e9ba330..cbfb6e68940 100644
--- a/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
+++ b/TAO/tests/MT_NoUpcall_Connect/MT_NoUpcall_Connect.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl b/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
index aa4615506d4..6b706cfbcbc 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Idl {
interface SharedIntf {
void do_upcall ();
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
index bc14376a412..cfaaf75e7ec 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Log_Priority.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
index 145e3a82a16..cd7cde57f25 100644
--- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
+++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SHAREDINTF_I_H_
#define SHAREDINTF_I_H_
diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp
index 312ad65667a..78d2941f6f4 100644
--- a/TAO/tests/MT_NoUpcall_Connect/client.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntfC.h"
#include "SharedIntfS.h"
diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp
index 771f8f10323..f691ae823f2 100644
--- a/TAO/tests/MT_NoUpcall_Connect/server.cpp
+++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SharedIntf_i.h"
#include "ace/Task.h"
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index bbcbfa8e1b6..ddbc541fa2f 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index e95c34b2f64..bae8827649c 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index ea6351e2bdf..82620993a6c 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index c42d5905cc6..9847377ea95 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/MT_Server/test_i.inl b/TAO/tests/MT_Server/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/MT_Server/test_i.inl
+++ b/TAO/tests/MT_Server/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index ac60578d994..3c4a5ef3d64 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index f6ef9ebbff2..a1a9569a78b 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 07af58ea28d..6927fb9f275 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sleep_Service.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
index b8130b84a4d..aef448e5be3 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
+++ b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
test.idl
diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
index 610ac702929..e74ef70b9c2 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
index 200b4ec6fa6..5a6ba3b7a37 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
+++ b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Monitor/Marshal_Buffer/server.cpp b/TAO/tests/Monitor/Marshal_Buffer/server.cpp
index e73b5750d94..21d5cf6125c 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/server.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/CORBA_macros.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test.idl b/TAO/tests/Monitor/Marshal_Buffer/test.idl
index 107036708f4..6a9e21913c6 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test.idl
+++ b/TAO/tests/Monitor/Marshal_Buffer/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
string test_op (in string in_arg);
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp b/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
index 90017cce332..d92724af92a 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
+++ b/TAO/tests/Monitor/Marshal_Buffer/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/streams.h"
#include "test_i.h"
diff --git a/TAO/tests/Monitor/Marshal_Buffer/test_i.h b/TAO/tests/Monitor/Marshal_Buffer/test_i.h
index bc6ab9a5ac5..f02d712dd0c 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/test_i.h
+++ b/TAO/tests/Monitor/Marshal_Buffer/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TEST_I_H
#define TAO_TEST_I_H
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 55a5b85d921..58ba868e616 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocation_Tester.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 9e190d77bc5..e463f41bfe9 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Gd
IDL_Files {
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 96788e8b1b8..8906917662d 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
# include "Collocation_Tester.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index c20b1a7d488..cedcde206be 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple_Impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
index a045d5540d8..04e8b654387 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A
{
string method1 ();
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index c57114e6146..28338fe7751 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Multiple_Inheritance.idl
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index ae87b53f82a..de6f2e48629 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple_InheritanceS.h"
class Multiple_Inheritance_i : public POA_D
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 2cf2385d16f..aae19ba1755 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Multiple_Inheritance_i.h"
#include "tao/Utils/ORB_Manager.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
index 250ee6a55d4..4deb6598d9c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Hello.h"
#include <iostream>
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
index 0b23fc42f14..90b09e158c0 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Retry_On_Connection_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
index c2fa3ae7849..9fb90a86da2 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
index c08c71cb744..43d54b1dd5c 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
index ee705f01845..a158bbdf7cd 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/Retry_On_Reply_Failure.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
index ecd2d0df42d..bc53d39ce43 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
index 295e3bd018d..2be72bb5c4c 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/IORTable/IORTable.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
index b9aa7108ed3..98cde9d77b1 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
boolean test_is_a (in string type);
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
index 042b552b16d..a0e5aedb34f 100755
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/Invocation_Utils.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index fa5851d93de..5ed49ad40c1 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 07c2d7d5a75..413809511ec 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 9573acfcedc..2e4dce3e7dd 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 7314f7555fe..66ba195352c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.inl b/TAO/tests/Muxed_GIOP_Versions/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.inl
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index ed8d0a0daee..9980092ae66 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e5d0bc88b04..9f69fba62ea 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index dc8a4887b11..99b5c23bd73 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 2bf43f81b15..3c6b62ee443 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 9cc69f36f8b..63b68482745 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 3006f8dfe10..87cdea0c03e 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp
index 43643b16f0d..dfa3792ac03 100644
--- a/TAO/tests/Native_Exceptions/test_i.cpp
+++ b/TAO/tests/Native_Exceptions/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/tests/Native_Exceptions/test_i.inl b/TAO/tests/Native_Exceptions/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/tests/Native_Exceptions/test_i.inl
+++ b/TAO/tests/Native_Exceptions/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index cba516a30ef..c322e961173 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Idl): taoidldefaults {
IDL_Files {
MT_Client_Test.idl
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index ec285b86e6b..3a0103984a7 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 555e40df214..7c6cbeaf6a4 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index 7525ef2160c..c25ba3f761f 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
client_i::client_i (int quiet,
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index b0d308f04b8..a257039dab6 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class client_i : public POA_client
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 8121c3a19b5..1f63d771f33 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 6e8e09d9f89..ca14337b876 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (int quiet,
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index adc1cf9dd25..6b070844b0b 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 7a979bec324..027c9993cb2 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index 7d62074dd0d..d3abeefc0c3 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Nested_Upcall_Server_Idl): taoidldefaults {
IDL_Files {
Triangle_Test.idl
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 77c1118e5ce..1acef8e7aff 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 4f1a972f14f..4c06f40fb06 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "test_i.h"
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 2dbfed5c6fc..53dc6f26297 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 607f87b5ee1..26856a86a83 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 2c87f7099a8..58d9362d0f7 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class server_i : public POA_server
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index 346ff645141..602268f2aa1 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 4f87edd2180..f2127345363 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Peer.h"
#include "Clock_Ticks.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index 16801621f7b..e548316cdc5 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index 5abc07a54f5..47b5e700d19 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Peer.h"
#include "Clock_Ticks.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index bbcbfa8e1b6..ddbc541fa2f 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index ee461bf6f73..6649dbc7b0c 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index cc915920a38..3100cffb926 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index f2601f6c371..50d71b99e44 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index 8a27179f677..e9a304aa039 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_NO_SERVER_MT_CLIENT_TEST_I_H
#define TAO_NO_SERVER_MT_CLIENT_TEST_I_H
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 7f28d3934f3..940f6962ce5 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyS_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index cb7c8c9ef6c..a0917968a02 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Any.idl
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 834c8aee7f7..4727efe5d5b 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index cc4bf4b55a1..5870e17a604 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AnyS_impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
index 874fb7e2c0c..fea2ea46f89 100644
--- a/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Collocated/Forward/OBV_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, valuetype {
exename = collocated
Source_Files {
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index 206465a0e52..9e0fb1ab75a 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
index b350133f8ea..666b02e83fe 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Forward declaration to make recursive construct.
valuetype BaseNode;
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeController.idl b/TAO/tests/OBV/Collocated/Forward/TreeController.idl
index cdeffe9830b..464276ea890 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeController.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeController.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype BaseNode;
// This TreeController is probably a silly idea.
diff --git a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
index f37c1639395..f8157f7f660 100644
--- a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
+++ b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBase.idl"
//
diff --git a/TAO/tests/OBV/Factory/Factory.idl b/TAO/tests/OBV/Factory/Factory.idl
index 43ce343697a..1fe2ccc8022 100644
--- a/TAO/tests/OBV/Factory/Factory.idl
+++ b/TAO/tests/OBV/Factory/Factory.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains few valuetypes to show and test basic OBV factory
// construct functionality.
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index ceeec488401..c0cde67dcba 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC_impl.h"
OBV_FactoryTest::Value2*
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index a1bd5c28db1..c9e250aa71d 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC_impl.h"
#include "FactoryS_impl.h"
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index 9e3d394d840..25cf9725e90 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Factory.idl
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 902fb5dd29d..3a2c472c964 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryC.h"
#include "FactoryC_impl.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 528d1516f73..1eb6fa98891 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FactoryS_impl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index e59ee7d2022..f3d88ea7381 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
TreeBase.idl
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 78d97b39cf7..9f65ab9bc71 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "TreeBaseC.h"
diff --git a/TAO/tests/OBV/Forward/TreeBase.idl b/TAO/tests/OBV/Forward/TreeBase.idl
index b350133f8ea..666b02e83fe 100644
--- a/TAO/tests/OBV/Forward/TreeBase.idl
+++ b/TAO/tests/OBV/Forward/TreeBase.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Forward declaration to make recursive construct.
valuetype BaseNode;
diff --git a/TAO/tests/OBV/Forward/TreeController.idl b/TAO/tests/OBV/Forward/TreeController.idl
index cdeffe9830b..464276ea890 100644
--- a/TAO/tests/OBV/Forward/TreeController.idl
+++ b/TAO/tests/OBV/Forward/TreeController.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype BaseNode;
// This TreeController is probably a silly idea.
diff --git a/TAO/tests/OBV/Forward/TreeNode.idl b/TAO/tests/OBV/Forward/TreeNode.idl
index f37c1639395..f8157f7f660 100644
--- a/TAO/tests/OBV/Forward/TreeNode.idl
+++ b/TAO/tests/OBV/Forward/TreeNode.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBase.idl"
//
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index 9055a264a94..ab5273dcd11 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBaseC.h"
#include "TreeControllerC.h"
#include "TreeNodeC.h"
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index 9ed20a28341..b809ee50eac 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TreeBaseC.h"
#include "TreeControllerC.h"
#include "TreeNodeC.h"
diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp
index 4fecc7e5a81..4174e3ea656 100755
--- a/TAO/tests/OBV/Indirection/Factory.cpp
+++ b/TAO/tests/OBV/Indirection/Factory.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Factory.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/OBV/Indirection/Factory.h b/TAO/tests/OBV/Indirection/Factory.h
index 76acb647878..9ea876feab7 100755
--- a/TAO/tests/OBV/Indirection/Factory.h
+++ b/TAO/tests/OBV/Indirection/Factory.h
@@ -1,4 +1,3 @@
-// $Id$
#include "tao/Valuetype/ValueFactory.h"
#include "tao/ORB.h"
#include "MessengerC.h"
diff --git a/TAO/tests/OBV/Indirection/Indirection.mpc b/TAO/tests/OBV/Indirection/Indirection.mpc
index 91ac7d5e1b8..f2fc815fd87 100644
--- a/TAO/tests/OBV/Indirection/Indirection.mpc
+++ b/TAO/tests/OBV/Indirection/Indirection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): taoidldefaults, valuetype {
IDL_Files {
Messenger.idl
diff --git a/TAO/tests/OBV/Indirection/Messenger.idl b/TAO/tests/OBV/Indirection/Messenger.idl
index 753dbad94ec..ec0de56f88c 100644
--- a/TAO/tests/OBV/Indirection/Messenger.idl
+++ b/TAO/tests/OBV/Indirection/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
module demo {
diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp
index 2269964b8b4..226a4cfd028 100644
--- a/TAO/tests/OBV/Indirection/MessengerClient.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "Factory.h"
#include <iostream>
diff --git a/TAO/tests/OBV/Indirection/MessengerServer.cpp b/TAO/tests/OBV/Indirection/MessengerServer.cpp
index f6797e1a980..21a4c088e53 100644
--- a/TAO/tests/OBV/Indirection/MessengerServer.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "Factory.h"
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.cpp b/TAO/tests/OBV/Indirection/Messenger_i.cpp
index bd845b32e07..09f9d062d83 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.cpp
+++ b/TAO/tests/OBV/Indirection/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/AnyTypeCode/TypeCode.h"
diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h
index dc8f061cb07..14736adccb8 100644
--- a/TAO/tests/OBV/Indirection/Messenger_i.h
+++ b/TAO/tests/OBV/Indirection/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_I_H
#define MESSENGER_I_H
diff --git a/TAO/tests/OBV/Simple/OBV.idl b/TAO/tests/OBV/Simple/OBV.idl
index f909dc25975..5436de284bd 100644
--- a/TAO/tests/OBV/Simple/OBV.idl
+++ b/TAO/tests/OBV/Simple/OBV.idl
@@ -1,5 +1,3 @@
-// $Id$
-
valuetype Event
{
void do_print ();
diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc
index 0e9f2963d62..127e02cfd51 100644
--- a/TAO/tests/OBV/Simple/OBV_Simple.mpc
+++ b/TAO/tests/OBV/Simple/OBV_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index 8ae13d5288a..b49d1f116d7 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "OBV_impl.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 4164a6ff96b..3bc81eda768 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (OBV_IMPL_H)
#define OBV_IMPL_H
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index 498547af46c..1ad1a9cfb8b 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_i.h"
#include "OBV_impl.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 0ed12054250..c7bab2b9e48 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This version of Simple_Util doesn't need to link against orbsvcs
// On the other hand it has no naming service.
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index d2e2dec29d7..0c1b6e8b9fc 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Simple_util.h"
#include "Server_i.h"
diff --git a/TAO/tests/OBV/Supports/Supports_Test.idl b/TAO/tests/OBV/Supports/Supports_Test.idl
index 9b60a941d7a..d1b5fe9a494 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.idl
+++ b/TAO/tests/OBV/Supports/Supports_Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
///////////////////////////////////////////////////////////////////////////////
/**
* \file Supports_Test.idl
diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc
index 4dcc86fc472..feba948cc52 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.mpc
+++ b/TAO/tests/OBV/Supports/Supports_Test.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Server): taoserver, valuetype, strategies {
// This is just a dummy_label to prevent the test from being compiled
// in MPC builds
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 385c6fa7dab..fa192f1d10b 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
// FUZZ: disable check_for_streams_include
#include "Supports_Test_impl.h"
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 976f570a3eb..0154a8f971f 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SUPPORTS_TEST_IMPL_H
#define TAO_SUPPORTS_TEST_IMPL_H
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 669d551153b..de74c2e2f51 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supports_Test_impl.h"
const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index 45870a85cab..764f628537a 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supports_Test_impl.h"
#include "tao/Strategies/advanced_resource.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 075cfc0f63c..8fb093bd48b 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
test.idl
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 5059c5a740c..1cf7dde9dc5 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index 7a7b83fb205..5a7d3f136d2 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index 71ca17435a1..ed20848b459 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/Truncatable/Extra.idl b/TAO/tests/OBV/Truncatable/Extra.idl
index 453b85a92b2..f61dc416695 100644
--- a/TAO/tests/OBV/Truncatable/Extra.idl
+++ b/TAO/tests/OBV/Truncatable/Extra.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains extra valuetypes which are unknown by the test
// server. We should be able to pass these values and have the server
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index d6b4c90da6e..34ab637d3b5 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
Extra.idl
diff --git a/TAO/tests/OBV/Truncatable/Truncatable.idl b/TAO/tests/OBV/Truncatable/Truncatable.idl
index b86e094c470..e5f7542b6bc 100644
--- a/TAO/tests/OBV/Truncatable/Truncatable.idl
+++ b/TAO/tests/OBV/Truncatable/Truncatable.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//
// This file contains few valuetypes to show and test truncatable feature of
// valuetype.
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index cf704486e3c..8c774f71e24 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableS_impl.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index c185a386dc7..1ddcc5470e2 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableC.h"
#include "ExtraC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index fdad2ebdcf2..26188c43b84 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TruncatableS_impl.h"
#include "TruncatableC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 50e9c5b1d19..7f6f0d2ceba 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
Test_impl::Test_impl (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index d4367b0dff2..506cd15686c 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "valueboxC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 37f27f1ccb3..88c3cab228f 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/OBV/ValueBox/valuebox.idl b/TAO/tests/OBV/ValueBox/valuebox.idl
index 235513c6c55..ccd9da6f193 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.idl
+++ b/TAO/tests/OBV/ValueBox/valuebox.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "vb_basic.idl"
#include "vb_struct.idl"
#include "vb_union.idl"
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index 27a4e43e502..f14a9d44810 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, valuetype {
IDL_Files {
vb_basic.idl
diff --git a/TAO/tests/OBV/ValueBox/vb_basic.idl b/TAO/tests/OBV/ValueBox/vb_basic.idl
index ab2556e3934..ad45ba0085a 100644
--- a/TAO/tests/OBV/ValueBox/vb_basic.idl
+++ b/TAO/tests/OBV/ValueBox/vb_basic.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of basic types
//=========================================================================
diff --git a/TAO/tests/OBV/ValueBox/vb_struct.idl b/TAO/tests/OBV/ValueBox/vb_struct.idl
index e25a207a2f0..79599bb43a4 100644
--- a/TAO/tests/OBV/ValueBox/vb_struct.idl
+++ b/TAO/tests/OBV/ValueBox/vb_struct.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of structs
//=========================================================================
diff --git a/TAO/tests/OBV/ValueBox/vb_union.idl b/TAO/tests/OBV/ValueBox/vb_union.idl
index 0a05be46651..59540ea4f6f 100644
--- a/TAO/tests/OBV/ValueBox/vb_union.idl
+++ b/TAO/tests/OBV/ValueBox/vb_union.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//=========================================================================
// Valuebox of unions
//=========================================================================
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
index f67164da137..a9d251e4c5c 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// @author Jeff Mirwaisi <jeff_mirwaisi@yahoo.com>
// @author Iliyan Jeliazkov <iliyan2ociweb.com>
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
index 647d6163b54..087cb5a1cc4 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc
@@ -1,6 +1,4 @@
-// $Id$
-
project (DllOrb) : taolib, portableserver {
dynamicflags += DLLORB_BUILD_DLL
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
index 9eb5083ea7b..8c8c3a8840c 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl DllOrb
// ------------------------------
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Bug_3049.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
index 9abda088933..168021f9f20 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// @author Phil Mesnier <mesnier_p@ociweb.com>
// This test scenario is documented in bugzilla bug 3049. This test
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
+++ b/TAO/tests/ORB_Local_Config/Bunch/Bunch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
index 395079eae05..d02259117bb 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// The following is required to be able to access
// ace_svc_desc_TAO_*_Parser, below
#include "tao/CORBALOC_Parser.h"
diff --git a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
+++ b/TAO/tests/ORB_Local_Config/Separation/Separation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Separation/Test.cpp b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
index ce39070e37b..20b3d0df33e 100644
--- a/TAO/tests/ORB_Local_Config/Separation/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Separation/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/IIOP_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 41b069b5daa..1e00a53f757 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Service_Config_DLL.h"
#include "ace/Service_Config.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h
index 1688a745350..4c20ae6a70d 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
index 33b67542727..da42a8f8e25 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
after += Service_Config_Dependent_DLL TAO
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 338701e06fa..a738fa1f230 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Codeset_Descriptor_Base.h"
#include "tao/Codeset_Manager_Factory_Base.h"
#include "tao/Codeset_Manager.h"
diff --git a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
+++ b/TAO/tests/ORB_Local_Config/Shared/Shared.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Shared/Test.cpp b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
index 9141a1fa422..ea5db3704c0 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/Protocol_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
index f683745f833..abcbf2a4812 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
+++ b/TAO/tests/ORB_Local_Config/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/tests/ORB_Local_Config/Simple/Test.cpp b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
index b2db8cc4308..024b805f6b7 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/CORBANAME_Parser.h"
#include "tao/CORBALOC_Parser.h"
#include "tao/Protocol_Factory.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index b56ec03a8e6..211d91693b2 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ORB_DLL.h"
#include "ace/Service_Config.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
index f9f8860f2cd..b7555de2a55 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Service_Config_ORB_DLL
// ------------------------------
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
index 9190e37b13a..1c6d5526d6e 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 00428f2f257..f4d3d6c8a2c 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index dd7162beabe..d5717fabb68 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ORB_DLL.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index ae4e5499fc3..98caf3d4143 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ORB_DLL.h"
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index 7d02ce2ba35..6e8ad2850e8 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONFIGURATION_PER_ORB_H
# define SERVICE_CONFIGURATION_PER_ORB_H
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.mpc b/TAO/tests/ORB_destroy/ORB_destroy.mpc
index 4665ebfdacc..cdb8729564c 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.mpc
+++ b/TAO/tests/ORB_destroy/ORB_destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
exename = ORB_destroy
}
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 137b3920ba8..ee8127dc804 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/ORB_init/ORB_init.mpc b/TAO/tests/ORB_init/ORB_init.mpc
index 7ccbe817f03..858d7f4b2d9 100644
--- a/TAO/tests/ORB_init/ORB_init.mpc
+++ b/TAO/tests/ORB_init/ORB_init.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = ORB_init
}
diff --git a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
index 2454cd6de7a..814a5e5ea44 100644
--- a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
+++ b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
}
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index a89d07632bf..e5e58917cdd 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simpleI.h"
int
diff --git a/TAO/tests/ORB_init/Portspan/simple.idl b/TAO/tests/ORB_init/Portspan/simple.idl
index 0505f36e9ac..dca7ddc8856 100644
--- a/TAO/tests/ORB_init/Portspan/simple.idl
+++ b/TAO/tests/ORB_init/Portspan/simple.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface simple {
void test();
};
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
index a55aa17b7e1..ec9cc2839da 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_Bar.h"
Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
index 6cbfa60be64..3b18febd081 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.mpc
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ORB Shutdown Server): taoserver {
Source_Files {
Foo_Bar.cpp
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 7618864afe6..ffeeb4fed2b 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Foo_Bar.h"
#include "ace/Time_Value.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 4d4b4688fc0..ec58bcf2742 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Test_ORT_IDL): taoidldefaults {
IDL_Files {
ORT_test.idl
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 53ddd0ecb11..aaa376144d8 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_IORInterceptor.h"
#include "ObjectReferenceFactory.h"
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 7580b83f35a..0c0a7eb42fe 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_i.h"
ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 846a745b131..7bc1831378c 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ObjectReferenceFactory.h"
#include "tao/debug.h"
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index c6170fd8ca3..9840a5ded32 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequestInterceptor.h"
#include "ORT_test_IORInterceptor.h"
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 7d71a124a69..096d6e628d1 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequestInterceptor.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index 9d3d446fe01..c0bddcfd54a 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index 5918b3c001b..19432676790 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORT_test_i.h"
#include "ServerORBInitializer.h"
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index ebbe574b6a7..34376b8cde5 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Loader.h"
#include "Test_i.h"
diff --git a/TAO/tests/Object_Loader/OLT_Export.h b/TAO/tests/Object_Loader/OLT_Export.h
index f7d3ad034b9..d8edca6fd21 100644
--- a/TAO/tests/Object_Loader/OLT_Export.h
+++ b/TAO/tests/Object_Loader/OLT_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index 74f49da753c..b9e1548f2e0 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Object_Loader/Test.idl b/TAO/tests/Object_Loader/Test.idl
index 609fe5f62c8..9d82ef2d79a 100644
--- a/TAO/tests/Object_Loader/Test.idl
+++ b/TAO/tests/Object_Loader/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 6ca3c420183..5df62655307 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
CORBA::Long
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index a7309ca3f19..7010222e5aa 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index dd82699300d..18f6f1a2b12 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index 1db48a68a30..047fe627f5b 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/ACE.h"
#include "testC.h"
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 93fa08571ff..cc6c92208a1 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index fb3a36f0e82..faae9d09299 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/ACE.h"
diff --git a/TAO/tests/OctetSeq/test_i.inl b/TAO/tests/OctetSeq/test_i.inl
index eb8ded0afd6..e356538b357 100644
--- a/TAO/tests/OctetSeq/test_i.inl
+++ b/TAO/tests/OctetSeq/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Database_i::Database_i (CORBA::ORB_ptr orb,
Test::Index max_range)
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index 68768aed3e2..30a7174af86 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
index 533fb3def3b..d36e5a92cbd 100644
--- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
+++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp
index d00f9a7cf84..a32cac6d478 100644
--- a/TAO/tests/Ondemand_Write/client.cpp
+++ b/TAO/tests/Ondemand_Write/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp
index ab19d0fb0a7..93f0474ab01 100644
--- a/TAO/tests/Ondemand_Write/server.cpp
+++ b/TAO/tests/Ondemand_Write/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index f04ccc6e29a..64a47469668 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 0443972028e..b771e06306d 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Buffering_Admin.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 7c60f9a794f..3d1970e478c 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index c27cd5cf5f0..af9a0bbe2b1 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Buffering.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index 7b516f83f14..f80506b0c0d 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.h b/TAO/tests/Oneway_Send_Timeouts/Client.h
index 73ff2b8282f..4413cacdbfb 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _CLIENT_
#define _CLIENT_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
index 16f16b996be..b40ae16d536 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _CLIENT_TASK_
#define _CLIENT_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
index 88ce953eee7..60b870e3799 100644
--- a/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/ORB_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _ORB_TASK_
#define _ORB_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
index 43b719cbf51..2fb59a4ac0c 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
+++ b/TAO/tests/Oneway_Send_Timeouts/Oneway_scenarios.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
index a0122a45d7b..be87b9e6ba4 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.h b/TAO/tests/Oneway_Send_Timeouts/Server.h
index 13f7e5b9ed2..09d98a408d7 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVER_
#define _SERVER_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
index ed5db5eb1bd..08862f30111 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _SERVER_TASK_
#define _SERVER_TASK_
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test.idl b/TAO/tests/Oneway_Send_Timeouts/Test.idl
index 2794efc1f03..e8d89500d3e 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Send_Timeouts/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// sleep for the said time, unless u head from
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
index 036c9580781..a8cccb33fb9 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.h b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
index 75c56a3acc7..974a8401bba 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Test_i.h
+++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_I_
#define _TEST_I_
diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp
index 4d77273b0c7..c1153ecbbf8 100644
--- a/TAO/tests/Oneway_Send_Timeouts/main.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "Client_Task.h"
diff --git a/TAO/tests/Oneway_Timeouts/Test.idl b/TAO/tests/Oneway_Timeouts/Test.idl
index 30a517bde36..d076114e7c6 100644
--- a/TAO/tests/Oneway_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Timeouts/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Tester {
oneway void test(in long id);
long test2(in long id);
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index e11fea62581..52f7a79c751 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index 3de5af50ebf..19b7f52659f 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index 3f3e7cd6050..1cf73d70add 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index ca0d05b4dfb..a6a55473f33 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index f12cbc8c09b..78148ce9169 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_i.h"
Receiver_i::Receiver_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 6944edebff0..6708456bf72 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
Sender_i::Sender_i (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 89b4c650553..9195b04f6f9 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_i.h"
#include "Client_Task.h"
#include "Server_Task.h"
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index ac3522946f8..6a20088761f 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Optimized_Connection/Optimized_Connection.mpc b/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
index 39ff38f6991..8c2228d75c6 100644
--- a/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
+++ b/TAO/tests/Optimized_Connection/Optimized_Connection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp
index 42295a80a16..cb8915cd7d0 100644
--- a/TAO/tests/Optimized_Connection/oc_client.cpp
+++ b/TAO/tests/Optimized_Connection/oc_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 47df8aeb010..f414495f426 100644
--- a/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/tests/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
libs += Generic_Servant
after += POA_Generic_Servant_Lib
diff --git a/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
index cb7932e188b..6171a717542 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
+++ b/TAO/tests/POA/Bug_1592_Regression/Bug_1592_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
index b46f29f82bd..6035eafe86f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServantLocator.h"
#include "test_i.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
index b6aff9b68d2..11972183323 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
index 38d56a401a0..8a9a3a32d87 100644
--- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Request_Interceptor.h"
CORBA::Boolean receive_request_service_contexts_called = 0;
diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp
index f7c91f25a47..ecf0b20b126 100644
--- a/TAO/tests/POA/Bug_1592_Regression/client.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp
index 0066751ec00..a1aef31be38 100644
--- a/TAO/tests/POA/Bug_1592_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ServantLocator.h"
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
index 4d9d57dd008..e5bba01dc1f 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
extern CORBA::Boolean receive_request_called;
diff --git a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
index 91146f271ff..3d6ca8e469f 100644
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/tests/POA/Bug_2511_Regression/test.idl b/TAO/tests/POA/Bug_2511_Regression/test.idl
index 373c4ef82f0..5f6b89393a9 100644
--- a/TAO/tests/POA/Bug_2511_Regression/test.idl
+++ b/TAO/tests/POA/Bug_2511_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void normal ();
diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc
index d2819003e8f..425874ce4f5 100644
--- a/TAO/tests/POA/Current/Current.mpc
+++ b/TAO/tests/POA/Current/Current.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = Current
}
diff --git a/TAO/tests/POA/DSI/Database.idl b/TAO/tests/POA/DSI/Database.idl
index b2b0b21cb2b..a4b6e40a42d 100644
--- a/TAO/tests/POA/DSI/Database.idl
+++ b/TAO/tests/POA/DSI/Database.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Database
{
typedef unsigned long Flags;
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index 0de086a877e..09554524fb5 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Database_i.h"
#include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index 4f625079c9b..caa24a15eab 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DatabaseS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc b/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
index 137d4f17e33..fcf8751aa5c 100644
--- a/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
+++ b/TAO/tests/POA/Deactivate_Object/Deactivate_Object.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index a4ccb0f8198..57c35e134ba 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index 582c1f14733..132c7635cbe 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA Default Servant): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Default_Servant
}
diff --git a/TAO/tests/POA/Default_Servant/test.idl b/TAO/tests/POA/Default_Servant/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Default_Servant/test.idl
+++ b/TAO/tests/POA/Default_Servant/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc b/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
index b48685f3af7..80a425240dd 100644
--- a/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant2/POA_Default_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults, anytypecode {
IDL_Files {
File.idl
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index 35f5976c43a..66fbc15d13d 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index d5043541f5d..99120e971d0 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 8e6bc1ccd34..37425ab21fd 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "tao/PolicyC.h"
#include "tao/EndpointPolicy/EndpointPolicy.h"
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index 3aa46e5d4cf..1dca33b12d9 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Etherealization
}
diff --git a/TAO/tests/POA/Etherealization/test.idl b/TAO/tests/POA/Etherealization/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Etherealization/test.idl
+++ b/TAO/tests/POA/Etherealization/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 413f8d26750..a06ce3cfcec 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Excessive_Object_Deactivations
}
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/test.idl b/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
index c7d0b23d96e..3c2146f8325 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void deactivate_self ();
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
index c6bb0dfd35d..6f43518ffd6 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taolib, wfmo {
sharedname = Alt_Resource_Factory
dynamicflags += Alt_Resource_Factory_BUILD_DLL
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
index 898bad28526..3c8cfc796d0 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Definition for Win32 Export directives.
// This file is generated automatically by
// ${ACE_ROOT}/GenExportH.BAT
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
index 9b6ae031814..f84623cbe4f 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Resource_Factory.h"
#include "ace/WFMO_Reactor.h"
diff --git a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
index 5ddb73d0a37..206c0a1ee8b 100644
--- a/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
+++ b/TAO/tests/POA/Explicit_Activation/Alt_Resources/Resource_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/default_resource.h"
#include "Alt_Resource_Factory.h"
diff --git a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
index 47df8aeb010..f414495f426 100644
--- a/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/tests/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
libs += Generic_Servant
after += POA_Generic_Servant_Lib
diff --git a/TAO/tests/POA/FindPOA/Adapter_Activator.cpp b/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
index 1e4a8689991..21ccbf46fe1 100644
--- a/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
+++ b/TAO/tests/POA/FindPOA/Adapter_Activator.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Adapter_Activator.h"
#if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tests/POA/FindPOA/POA_FindPOA.mpc b/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
index 82b289cf4b2..bc12f9b3a4f 100644
--- a/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/tests/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = FindPOA
}
diff --git a/TAO/tests/POA/Forwarding/POA_Forwarding.mpc b/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
index 1ef382e5f9d..6d373a09ebc 100644
--- a/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/tests/POA/Forwarding/POA_Forwarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults, anytypecode {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
index 605a43debaf..437245c15d8 100644
--- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Activator.h"
#include "test_i.h"
diff --git a/TAO/tests/POA/Forwarding/test.idl b/TAO/tests/POA/Forwarding/test.idl
index 6f4c8f78d99..3a6c4ee76b3 100644
--- a/TAO/tests/POA/Forwarding/test.idl
+++ b/TAO/tests/POA/Forwarding/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
long doit ();
diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp
index e5869d89c06..4381f124cc1 100644
--- a/TAO/tests/POA/Forwarding/test_i.cpp
+++ b/TAO/tests/POA/Forwarding/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "Servant_Activator.h"
diff --git a/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc b/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
index f593bd9fac7..0670ac763a8 100644
--- a/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/tests/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(POA_Generic_Servant_Lib): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = Generic_Servant
dynamicflags += GENERIC_SERVANT_BUILD_DLL
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index 2d6f2520451..3ed1ef070f4 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
index 4cb970ec91a..4cf6f40c6e5 100644
--- a/TAO/tests/POA/Generic_Servant/generic_servant_export.h
+++ b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/POA/Generic_Servant/test.idl b/TAO/tests/POA/Generic_Servant/test.idl
index bab53c761a0..a2e236e0a56 100644
--- a/TAO/tests/POA/Generic_Servant/test.idl
+++ b/TAO/tests/POA/Generic_Servant/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp
index 2335e268f06..e8c87b99e13 100644
--- a/TAO/tests/POA/Generic_Servant/test_i.cpp
+++ b/TAO/tests/POA/Generic_Servant/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index be9b7edff28..a8b8fce6c61 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Identity
}
diff --git a/TAO/tests/POA/Identity/test.idl b/TAO/tests/POA/Identity/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Identity/test.idl
+++ b/TAO/tests/POA/Identity/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Loader/POA_Loader.mpc b/TAO/tests/POA/Loader/POA_Loader.mpc
index fe5d10539dc..9eae50e2563 100644
--- a/TAO/tests/POA/Loader/POA_Loader.mpc
+++ b/TAO/tests/POA/Loader/POA_Loader.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 3511aeffe3b..02631843c12 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Manager.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index 4f833a99773..a3a2627aa30 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = MT_Servant_Locator
}
diff --git a/TAO/tests/POA/MT_Servant_Locator/test.idl b/TAO/tests/POA/MT_Servant_Locator/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/MT_Servant_Locator/test.idl
+++ b/TAO/tests/POA/MT_Servant_Locator/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index 9d66d52ba76..289593831a5 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Nested_Non_Servant_Upcalls
}
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl b/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc b/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
index f4e31f3dfd0..d3cc7476bb5 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
+++ b/TAO/tests/POA/Non_Retain_System_Id/Non_Retain_System_Id.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
}
diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.idl b/TAO/tests/POA/Non_Retain_System_Id/test.idl
index 8fb4acbb8ee..a022a3c50e7 100644
--- a/TAO/tests/POA/Non_Retain_System_Id/test.idl
+++ b/TAO/tests/POA/Non_Retain_System_Id/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface ID_Check
{
boolean check_servant_id (in short index);
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
index 5c7c5dfdef0..22cc630d00f 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = Non_Servant_Upcalls
}
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/test.idl b/TAO/tests/POA/Non_Servant_Upcalls/test.idl
index ae2a5fd10d4..c7f88e22381 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/test.idl
+++ b/TAO/tests/POA/Non_Servant_Upcalls/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
};
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index 6906d0d5e2c..9e95af510b3 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_corba_e_micro {
exename = Object_Reactivation
}
diff --git a/TAO/tests/POA/Object_Reactivation/test.idl b/TAO/tests/POA/Object_Reactivation/test.idl
index c7d0b23d96e..3c2146f8325 100644
--- a/TAO/tests/POA/Object_Reactivation/test.idl
+++ b/TAO/tests/POA/Object_Reactivation/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void deactivate_self ();
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
index 50882492aad..5a99021e652 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc b/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
index 75835257324..fa9cc036b8c 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(On_Demand_Act_D_Coll): taoserver, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = On_Demand_Act_D_Coll
idlflags += -Gd
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
index ccb6713f7d3..9b085e36eaa 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
/// Return a simple string
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
index 1deaae764e1..81d081c8b6b 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
index e7ed9c1e67b..97fca576f2f 100644
--- a/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
+++ b/TAO/tests/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
libs += Generic_Servant
diff --git a/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc b/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
index 91178d182f3..e6d5a7be1be 100644
--- a/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
+++ b/TAO/tests/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index bc7526091aa..b920ffbfda4 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Manager.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index eda1c8db7aa..d9961889a70 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = POAManagerFactory
}
diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc b/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
index 214c90a98d3..2e63603fcb1 100644
--- a/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, bidir_giop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = POA_BiDir
}
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
index 8c38573927a..96f19b0c217 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = POA_Destruction
}
diff --git a/TAO/tests/POA/POA_Destruction/test.idl b/TAO/tests/POA/POA_Destruction/test.idl
index 098546eb56e..d301677e078 100644
--- a/TAO/tests/POA/POA_Destruction/test.idl
+++ b/TAO/tests/POA/POA_Destruction/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void destroy_poa ();
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index 015c644c121..8028011df4a 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA_IDL*): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/POA/Persistent_ID/test.idl b/TAO/tests/POA/Persistent_ID/test.idl
index 5651d1d18f6..d3545b73fb4 100644
--- a/TAO/tests/POA/Persistent_ID/test.idl
+++ b/TAO/tests/POA/Persistent_ID/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index d0363276786..6835ae7bd26 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, pi_server, avoids_corba_e_micro {
exename = Policies
}
diff --git a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
index 380a58cedeb..5a799ef7697 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/tests/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = server
libs += Generic_Servant
diff --git a/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc b/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
index 68a3f8087d1..1b93ecbf8f0 100644
--- a/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
+++ b/TAO/tests/POA/Reference_Counting/Reference_Counting.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
test.cpp
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index 8631f9e284a..976250bf66b 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HelloS.h"
class Hello_impl :
diff --git a/TAO/tests/POA/RootPOA/RootPOA.mpc b/TAO/tests/POA/RootPOA/RootPOA.mpc
index cbe208a28b8..ca7899507a0 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.mpc
+++ b/TAO/tests/POA/RootPOA/RootPOA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
exename = RootPOA
}
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index 558e66bb88e..ae830fcc934 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Single_Threaded_POA
}
diff --git a/TAO/tests/POA/Single_Threaded_POA/test.idl b/TAO/tests/POA/Single_Threaded_POA/test.idl
index dd1b063b9bf..75349b2460e 100644
--- a/TAO/tests/POA/Single_Threaded_POA/test.idl
+++ b/TAO/tests/POA/Single_Threaded_POA/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/POA/TIE/POA_TIE.mpc b/TAO/tests/POA/TIE/POA_TIE.mpc
index d252530897f..3b02a6017ad 100644
--- a/TAO/tests/POA/TIE/POA_TIE.mpc
+++ b/TAO/tests/POA/TIE/POA_TIE.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL) : taoidldefaults {
idlflags += -GT
IDL_Files {
diff --git a/TAO/tests/POA/TIE/test.idl b/TAO/tests/POA/TIE/test.idl
index 409ca428547..bf6ceb30f81 100644
--- a/TAO/tests/POA/TIE/test.idl
+++ b/TAO/tests/POA/TIE/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface A
{
long doit();
diff --git a/TAO/tests/POA/wait_for_completion/test.idl b/TAO/tests/POA/wait_for_completion/test.idl
index 098546eb56e..d301677e078 100644
--- a/TAO/tests/POA/wait_for_completion/test.idl
+++ b/TAO/tests/POA/wait_for_completion/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void destroy_poa ();
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
index dc2f374ac05..2c43ed26bd1 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(POA*): taoserver {
exename = wait_for_completion
}
diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
index 6b71b6b4c45..e4254511318 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
index 3e96f955529..0364c520ba5 100644
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
index ee7c20180f5..9183225ec89 100644
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 0b887ef7890..e893228d48a 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
idlflags -= -Sa -St
diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
index ab5cf4db05d..edd41fca1db 100644
--- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
+++ b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*StubTest) : taoexe, iormanip {
exename = StubTest
}
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index f013183931e..d966325e7cc 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//========================================================================
/**
* @file StubTest.cpp
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index b49ac5b2594..b13e6c7a62c 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Policies/Policies.mpc b/TAO/tests/Policies/Policies.mpc
index 05a385e23a3..2f2b4ded042 100644
--- a/TAO/tests/Policies/Policies.mpc
+++ b/TAO/tests/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Policies Manipulation): taoserver, messaging {
exename = Manipulation
}
diff --git a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
index b6358d7d003..6cb3839bf8d 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, ami {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index b156ee49c15..f2f7aace2da 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo_Handler.h"
#include "Client_ORBInitializer.h"
#include "Client_Interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index b02337b54a6..167f3b67ab6 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Echo.h"
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
index 329a7bf2abd..35d60e1fc5a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
StateTransfer.idl
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
index 6956b78b5fe..d953f523d12 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
InvokeMe.idl
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
index 329a7bf2abd..35d60e1fc5a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
StateTransfer.idl
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index 7556789e871..bfea67d3b52 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptors.h"
#include "Interceptor_Type.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index 5ecdecaeba5..a6259649f88 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Interceptor_Type.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 8c21f40315e..7626584c1bb 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index afb0b9d78f7..6bb583988f2 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "Interceptor_Type.h"
#include "server_interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 4d8f0fdea34..758467497be 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "marker.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 476a46d1dd4..6bad18941ff 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptors.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
index 41a2427480b..bb1ca298186 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "marker.h"
void
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
index b4cff869591..032e5d1771a 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/High_Res_Timer.h"
#include "ace/Sched_Params.h"
#include "ace/Stats.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index a80e5756488..6cd7e017c72 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "Server_ORBInitializer.h"
#include "Interceptor_Type.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index f4635a5725c..ab937bde14d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptors.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 59c01162ab9..f11b29b637b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "marker.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index 395e526a9f0..14de839b7b3 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 778c95a2df9..8477a62bab0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index d76f6edc043..83fff97dd0e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
Server_ORBInitializer::Server_ORBInitializer (void)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index c7672a26863..50382009f30 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 6744b086064..f295510e9df 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index e7af8982051..8b40121a747 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index 152ccde0295..edd7970ba88 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 75d61f3827e..96622f81dc5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc b/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
index 87022b449ba..c6b56a9f3f7 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Bug_2088.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, pi, interceptors {
Source_Files {
Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index e578f750ae8..928a4bcaf22 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
Client_ORBInitializer::Client_ORBInitializer (void) :
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index c908fa6d094..241b24ac0de 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc b/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
index 4e3a62f3f1e..d2985a68338 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Bug_2133.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
index 8c25c69b51e..3c88fae18c2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
index 430c542a0a3..2e31783440f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
Hello::Hello (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 50dd18fa608..517fc42e10b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
index 2017e62d471..90979bacc9f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
index 3063d6f4817..2409dc8c8ba 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index c11f53f3fee..e161807d365 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index 326900d2a38..bf5d836fee0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
extern PortableInterceptor::SlotId slotId;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index 3b0965ad24b..684b13eb11b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Synch.h"
#include "ace/Thread.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index 5c27180d963..ae8793e46e2 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index 9061a527d11..d2bf86eb2b5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index 353766f9d5b..f364a40b997 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
index f2f1ff2ea50..45e61e456ce 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test_Interceptors
{
exception Silly
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 97e8b1004c2..2d056041912 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/PI/PI.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc b/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
index 2609cbc8946..4574377850b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Bug_3079.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
index b67fbb88829..8b78e2b5f97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
index 2e00425798a..b2b5e218e97 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
index 43de785db81..6a7adb205d8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
index 3a0f5ad82ac..7ef2a0b85c1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "CrashPoint.h"
short crash_point = 0;
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
index a3729431834..1bd3a22875c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/CrashPoint.h
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#ifndef CRASH_POINT_H
#define CRASH_POINT_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
index 8a83f147441..a59e89f3924 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
index 28755d413ad..116752a998e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
index 52449966d7f..a30c6d173d6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
index 6614e3bc958..1f2abcbc24b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
index 04ac47995c7..74a9139b150 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
index d04d4dcca49..c996ac5effe 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test.idl b/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
index 8a89326b9c9..f30224b01f9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RedirectionTest
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc b/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
index d7bf9a06c79..772a9a401cf 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Bug_3080.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
index ba1070b0cd5..49a8ac8dc7f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
index d39b06e5685..3d1aedf4e24 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
index e0c6aaeedea..b6ec4f91abd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
index 325adf61729..8b106735713 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
index 488ff0e88f1..6f204d5bf47 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
index 2f461dd4d16..5ecdaf7cb13 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test.idl b/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
index 3a0b56d8d83..223c8b3cf0f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
module RedirectionTest
{
interface test
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
index 15b949a6996..ee3dd1054dc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
index df6b2fa9a8f..d8033778330 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
index 01dedacbeaa..3753fc5ccdc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc b/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
index c900c79a4b9..c05e8d2e3dc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/PI_RTException.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
index 31689d1c388..66dec2b7392 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
index a849a628e61..5d22f6f4295 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
index 4eaa929ca10..5394038b172 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RTTest
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index c9fb4b2e48d..33dbd1eff79 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
index e116424db27..f296ce1d963 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors {
exename = Collocated_Test
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index ffaf78aae2c..78d71c38a09 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 751f151c6bd..fb93e7ba264 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 32a4e3ba0e2..24d6b91041f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index 2fe57c77168..22691fc3001 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index cf8e7e6a23f..bc2ed90101e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -1,4 +1,3 @@
-// $Id$
//
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_CLIENT_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index 104386eca6c..e86871a0cae 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Collocated_ORBInitializer.h"
#include "interceptors.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 2c4cfe9de0e..7d7fd7ebafe 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index fcf3dbabb25..24a593dfaf1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors {
exename = collocated
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index 0f0b6b5cbb1..022376a0ccd 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_SERVER_TASK_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_SERVER_TASK_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 117d516b577..d37a68bc5aa 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index ee11c0ae5f6..009b2779714 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVICE_CONTEXT_MANIPULATION_COLLOCATED_INTERCEPTORS_H
#define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_INTERCEPTORS_H
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index c10682c5c68..32bcca905a4 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 2cf11a1ff5f..2af09d07db9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Echo_Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index c5beae64d34..095a32b08e0 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Echo_Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 8ea24af1d2a..19709a5e882 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index 99e23771bf3..c0153f9e365 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 33fb5fbb16c..67647774e66 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index a6d7bc75836..6ca15eecd4b 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Echo_Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 5d0e7659b91..4f12e95e2d5 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test.idl b/TAO/tests/Portable_Interceptors/Dynamic/test.idl
index a5be699d716..fb66ba70eb9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test.idl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
// ===================================================================
/**
* @file test.idl
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 83e6eba0c99..540b0e2ebd3 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index fa8404d8845..d852f17e999 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 17e904ccc91..daad2df1a45 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index d4237b06ce8..982ef3787f4 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index 8409a93a337..d014deb7204 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 5a82e33c4d5..ced0a970b53 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/AnyTypeCode/TypeCode.h"
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index c9b39bd45c2..ccb2b1f35aa 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index d8cba77f51c..961421fbe02 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 04dfd2feb5b..cf8278aade8 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_ClientRequestInterceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index cfc99735237..5e88330aea7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_Client_ORBInitializer.h"
#include "FOO_ClientRequestInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index ebe19cd21e7..3edbd032331 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FOO_IORInterceptor.h"
#include "testS.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 450ce02d48f..2646a7d8ddf 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FOO_IORInterceptor_ORBInitializer.h"
#include "FOO_IORInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index cd6f166d8e8..b4ebc69a04b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index 9f5ca72f8d4..33e05aca03b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 0b2b3ba607a..e5228446bdd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 904570bb020..8444e9c7d44 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index c7da0da2ba0..3dc32fa6122 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index c248a50c45a..61c9937e968 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index 500f2c85eaf..d8b124a8f65 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index c7772228f6d..03a91660e71 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 2963c7aff62..3b7edf15ccd 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index 3467c5b3390..3fc798684a3 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index 507ac2ac517..efa8d158819 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ClientORBInitializer.h"
#include "ClientRequestInterceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index 5f402b7bdd5..bdb22b875ce 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequestInterceptor.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 0761a907fcc..04cb706bf19 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequestInterceptor2.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index b2eda2bb410..c1e76779505 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index 65217fc799f..5e5cbda05e4 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerORBInitializer.h"
#include "ServerRequestInterceptor.h"
#include "ClientRequestInterceptor2.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 396f088cc6e..74b6a11a33f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequestInterceptor.h"
#include "tao/CORBA_String.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index d4891c53162..50e5b30603f 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index c7b4b946957..ee757c7daeb 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index b2b72b018a4..7f6dd624104 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (PortableInterceptor::Current_ptr current,
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index 4f3a65687d3..f33cdc51bb2 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "IORInterceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index 1c048efbcbc..bd8f1ee2fd1 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Policy.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 1d60d5a2e41..cfb5b62333b 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PolicyFactory.h"
#include "Policy.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index 450419eaac7..1205fa138fb 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "IORInterceptor.h"
#include "PolicyFactory.h"
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 307332238dc..8e74e7d00a3 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index c6c5c380e07..545aac08305 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
index 5c4218c929f..59424ce20a6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Collocated): taoserver, pi, pi_server, interceptors, avoids_corba_e_micro {
exename = PI_ProcMode_Collocated_Test
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index ffaf78aae2c..78d71c38a09 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "interceptors.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index adde10c09d5..f74bba712bd 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/PI/ClientRequestInfoC.h"
#include "tao/PI_Server/ServerRequestInfoC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 4fe8eb0d837..f46bcf08ccb 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index c6c56772cfb..c7e728d43c4 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "testC.h"
#include "client_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
index 22c2a76d8d4..bb87c987e1a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_corba_e_micro {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index b658317741e..47fc26ac6d6 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "test_i.h"
#include "server_interceptor.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index a094b78f209..226dee9377a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index d50d028ec06..955feb9d110 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
#include "tao/AnyTypeCode/DynamicC.h"
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index 86c82f814ed..c16b0f9373c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
index 87022b449ba..c6b56a9f3f7 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Register_ORBInitializer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, pi, interceptors {
Source_Files {
Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 247c131a64f..72bfcfa6065 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index 15b949a6996..ee3dd1054dc 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index d7a70955a5c..93609cf3607 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_CLIENT_ORB_INITIALIZER_H
#define TAO_CLIENT_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 11dd4f09a45..8d7ff33ea6b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
index 01dedacbeaa..3753fc5ccdc 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef CLIENT_REQUEST_INTERCEPTOR_H
#define CLIENT_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
index 3a0f5ad82ac..7ef2a0b85c1 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "CrashPoint.h"
short crash_point = 0;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
index a3729431834..1bd3a22875c 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/CrashPoint.h
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#ifndef CRASH_POINT_H
#define CRASH_POINT_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
index 2609cbc8946..4574377850b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
+++ b/TAO/tests/Portable_Interceptors/Redirection/PI_Redirection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 8a83f147441..a59e89f3924 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index e9b99cf3eda..6ca5ef7f4b1 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_SERVER_ORB_INITIALIZER_H
#define TAO_SERVER_ORB_INITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 52449966d7f..a30c6d173d6 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "tao/ORB_Constants.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 6614e3bc958..1f2abcbc24b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef SERVER_REQUEST_INTERCEPTOR_H
#define SERVER_REQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
index be64cb15b69..19fb19e1a34 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 48dd464b76d..e2886be4346 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test.idl b/TAO/tests/Portable_Interceptors/Redirection/test.idl
index 8a89326b9c9..f30224b01f9 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test.idl
+++ b/TAO/tests/Portable_Interceptors/Redirection/test.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "tao/PI_Server/PI_Server_include.pidl"
module RedirectionTest
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
index 30d2e2053c9..7834dea421a 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Register_ORBInitializer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, pi, interceptors, avoids_corba_e_micro {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index 0998a5aac00..f2c9fe409a2 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "test_i.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index 55f9b3710d8..1694c6615a3 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
#include "test_i.h"
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
index 34a4258e7b0..6a8d2fbfb2e 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (void)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 78e66358303..d01f7c76f92 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 19da555bfb0..ca47ad3f403 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Client_Request_Interceptor.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
index f9487f30468..9a8b49dcb4e 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags -= -St
IDL_Files {
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index f91aeea4748..0a4590bf850 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Request_Interceptor.h"
Request_Interceptor::Request_Interceptor (const char *name)
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index 18520006375..7fd43c132b1 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/Exception.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index d47d16aeb08..435eb4e6a3d 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "testC.h"
#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 2a2ac4e7b73..27bbaa68fc7 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 023ad932f4a..b4fb5762a73 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 519ffd3319c..a99ca98158b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 395e526a9f0..14de839b7b3 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 13d6cfb232c..1fe2ff983db 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "Client_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index 8dbf21a741a..b33f1b1692b 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "client_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index 5891af15597..c028ce679b1 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_ORBInitializer.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index c6d15ecfdb6..a7660ec5c1a 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 75d61f3827e..96622f81dc5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Visual_i::Visual_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc b/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
index c7289e6e4f8..573d56acf84 100644
--- a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
+++ b/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*driver): orbsvcsexe, pi_server, interceptors {
exename = driver
Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
index aa24db1e945..e1519d1b7ee 100644
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@kolpackov.net>
-// $Id$
-
#include "tao/PI/PI.h"
#include "tao/LocalObject.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 5805f452dcd..f3b5abcd567 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): taoserver, tao_qtresource, ace_qt4 {
MOC_Files {
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 55261dcb1a1..6dc109b89c1 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 63101f832b2..18c3b4a3e72 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl
index d65cc24720a..e05b5b90acd 100644
--- a/TAO/tests/QtTests/test.idl
+++ b/TAO/tests/QtTests/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface LCD_Display
{
void send_val (in long val);
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 745b65dc513..3b019c1e6da 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
index 8112970c356..893da7c5995 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe {
exename = Queued_Message_Test
}
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
index 85905a99a88..72052a8815c 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver {
}
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 9371c089787..54cc414e83e 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// *******************************************************************
//
// This test links in RTCORBA and RTPortableServer and creates two
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
index 7ad0d88103b..14392a6edc5 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Arch_Idl {
interface Monitorable {
};
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index 4c00f78eff3..957582902c5 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index fb15c1bfa9d..6942d174cd2 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 0be2aa05dd1..d59cac80edf 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc b/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
index b7e6b09d0da..bb4e716d2d3 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Bug_3382_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
Source_Files {
server.cpp
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
index b1da2b8dbde..671d565d4b8 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
index e455ac9af81..3e5e24aa0d4 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index c6d20b0dc8a..253f91cd2f6 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
index 0d433be115e..620b1327e14 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/simple_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc b/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
index 07d678f931a..20e5098865f 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/Bug_3643_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
index 0901e47d1c7..7e0342f40b4 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
index a2562a1baf5..e981333a51e 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
index 93cf9c3939a..f619d77831a 100644
--- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
+++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 42e9f95661a..949b3859ab4 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 3e4bbdc8a2d..f6c5804dff7 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index e455ac9af81..3e5e24aa0d4 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interceptors.h"
#include "tao/OctetSeqC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index c969befaecb..2d7e68a5d92 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 2a58e30e83f..1b86934eb40 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 7894a7a4046..f46560e5472 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 360f8d9409b..1046f789a89 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index aaf702561a0..d1772091436 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Array_Base.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
index 76b154f13a5..42e0ac08d5c 100644
--- a/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
+++ b/TAO/tests/RTCORBA/Collocation/RTCORBA_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
exename = Collocation
}
diff --git a/TAO/tests/RTCORBA/Collocation/test.idl b/TAO/tests/RTCORBA/Collocation/test.idl
index fb23b0eeb08..29dd8932df5 100644
--- a/TAO/tests/RTCORBA/Collocation/test.idl
+++ b/TAO/tests/RTCORBA/Collocation/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void start ();
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index 1db92e716ab..8288d96bef0 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
index cad5007911c..d64d71e031d 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/RTCORBA_Destroy_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
exename = Destroy_Thread_Pool
}
diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
index 155d0516de5..ff80804b53d 100644
--- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Custom_Network_Priority_Mapping.h"
#include "tao/debug.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index b68fb6cda04..5553b69abee 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 8ff12669c25..396bf3cbe4f 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 1d783e35537..48f9dd6b394 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index e1a03f0299d..c18442452a1 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 43f0d5d83f7..7bdf6bff90d 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 93cf9c3939a..f619d77831a 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 9f222f50a1e..4bfbce54b6a 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 8c958b81d36..50c3d9ed8a4 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index b4b2e135b84..a9026c64252 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index dad4a066bc3..caa27bc9e3b 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index c95cb27668c..8267d9a2e70 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 3d635b57f48..de5e91f02cb 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/test.idl b/TAO/tests/RTCORBA/Linear_Priority/test.idl
index 93c7ac56f50..df676082f4f 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/test.idl
+++ b/TAO/tests/RTCORBA/Linear_Priority/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 7fe1672ae73..30905838e99 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
Source_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index e2cb0bc9020..48a6b0f905a 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 22c226a5d2d..dd493dd7b41 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 353b8f29a50..faee740ce21 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
index 54605e4c57a..7c1dea45626 100644
--- a/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
+++ b/TAO/tests/RTCORBA/ORB_init/RTCORBA_ORB_init.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (ORB_init_RT) : rt_client {
exename = ORB_init
}
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index dad4a066bc3..caa27bc9e3b 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 540c1e002a2..016bb479251 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index fbfb1d0974d..4f81db55c44 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/test.idl b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
index 5c4d926d6cf..36e44236901 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/test.idl
+++ b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/Policies/Policies.mpc b/TAO/tests/RTCORBA/Policies/Policies.mpc
index b94ae30ec74..45c246e8884 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.mpc
+++ b/TAO/tests/RTCORBA/Policies/Policies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTCORBA Policies Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Policies
}
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 5040de044de..499ea306b2d 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index f0f3dee1ecd..a078e62bc71 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "testC.h"
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index fb3743ca079..c6fde5e5d02 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/test.idl b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
index 6d6ba1c9f84..e1865eb9b06 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/test.idl
+++ b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
short method ();
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index 968e12e75bd..bb1ff6f6332 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 8c424029757..75130ee1850 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index 636b668c44f..cadb2149ffa 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/Thread_Pool.h"
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 6b2f5be9e36..1851b7b0736 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index 2c2cd3ce609..e36c4ab63df 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/Policy_ManagerC.h"
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 0bf981d4dd8..5f1894cc998 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index 45c49c24cf6..3cbbe054250 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 51ad9e23a26..4a154cd0e18 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
#include "tao/RTCORBA/Thread_Pool.h"
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
index 93c7ac56f50..df676082f4f 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void method ();
diff --git a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
index 2d55bc96c4f..6d9cd9349e6 100644
--- a/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
+++ b/TAO/tests/RTCORBA/RTMutex/RTCORBA_RTMutex.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rt_server {
}
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 623819c300c..f1fb70b5967 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index 4c00f78eff3..957582902c5 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index dfa21801840..94011da03fe 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index c55dec52d54..b35389e6690 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "ace/Get_Opt.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 2d81c7c0606..7bee41818cc 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index eb45ac1526b..fe72f82d57e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index a0cf28825c7..620c748d934 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
#include "tao/RTCORBA/RT_Policy_i.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index c08dbc630cd..27ccba729f1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index a4eac855841..6b3ab9377b1 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
#include "tao/RTCORBA/RTCORBA.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index d5ff7b033f8..93f3a714a7a 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index f5f7fd2a337..b0ccaf4b360 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tests/RTCORBA/check_supported_priorities.cpp b/TAO/tests/RTCORBA/check_supported_priorities.cpp
index b10d8cbc291..11ff3473e08 100644
--- a/TAO/tests/RTCORBA/check_supported_priorities.cpp
+++ b/TAO/tests/RTCORBA/check_supported_priorities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Sched_Params.h"
#include "tao/ORB_Core.h"
#include "tao/ORB.h"
diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp
index 55af5bcec45..beb292b7cad 100644
--- a/TAO/tests/RTCORBA/common_args.cpp
+++ b/TAO/tests/RTCORBA/common_args.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Read_Buffer.h"
#include "ace/Array_Base.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/RTScheduling/Current/Current.mpc b/TAO/tests/RTScheduling/Current/Current.mpc
index 6e425b993a1..876bc0b4f06 100644
--- a/TAO/tests/RTScheduling/Current/Current.mpc
+++ b/TAO/tests/RTScheduling/Current/Current.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Current) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index 03148fc9b2a..1aee52a1f54 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index b20a0f805ec..ab112932bf8 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "../Scheduler.h"
#include "tao/RTScheduling/RTScheduler_Manager.h"
diff --git a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc b/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
index 9349bca041e..6f62778535b 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
+++ b/TAO/tests/RTScheduling/DT_Spawn/DT_Spawn.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DT_Spawn) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 8b23bb0292a..b1b70d96ce3 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
index a87b61b1875..fd7b29a796e 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Thread_Cancel) : rtscheduling_client {
Source_Files {
../Scheduler.cpp
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index e6328945ddf..8791b9e4fad 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/Atomic_Op.h"
#include "ace/OS_NS_errno.h"
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index d58cea54ce6..8877b1c7f3b 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread_Task.h"
#include "ace/OS_NS_unistd.h"
#include "../Scheduler.h"
diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.mpc b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
index 8e02b6b7770..100fa8c433d 100644
--- a/TAO/tests/RTScheduling/VoidData/VoidData.mpc
+++ b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(VoidData) : rtscheduling_client {
exename = VoidData
Source_Files {
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index 38b1f4ff31d..64ccd76f2c0 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 06564a478f7..90190845885 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/Messaging/Messaging.h"
#include "tao/AnyTypeCode/Any.h"
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index a6840a8110d..f2a93b65dd1 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Oneway_Receiver.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc b/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
index 2750d6ef2a3..320b84b882c 100644
--- a/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
+++ b/TAO/tests/Sequence_Iterators/Sequence_Iterators.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(StringSeq) : taoexe {
exename = StringSeq
Source_Files {
diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
index ade6fc436ed..f2c600244e2 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*UB_Simple_Types) : seq_tests, taoexe {
Source_Files {
Unbounded_Simple_Types.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/test_macros.h b/TAO/tests/Sequence_Unit_Tests/test_macros.h
index 2db80f1410f..a51c08bb429 100644
--- a/TAO/tests/Sequence_Unit_Tests/test_macros.h
+++ b/TAO/tests/Sequence_Unit_Tests/test_macros.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#define FAIL_RETURN_IF(CONDITION) \
diff --git a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
index cf42218d334..d833b44bbc7 100644
--- a/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
+++ b/TAO/tests/Servant_To_Reference_Test/Servant_to_Reference.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
Source_Files {
server.cpp
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 0a9f412be5c..47308260ac2 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index 1b7d5497c06..7a90555bb9d 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Server_Connection_Purging/Test.idl b/TAO/tests/Server_Connection_Purging/Test.idl
index add2175d346..8a4875610b6 100644
--- a/TAO/tests/Server_Connection_Purging/Test.idl
+++ b/TAO/tests/Server_Connection_Purging/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
/*
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index ee883a364ac..c0e49323d01 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/Log_Msg.h"
#include "ace/SOCK_Connector.h"
diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp
index 406ab3f4fc9..0ff2c2fd269 100644
--- a/TAO/tests/Server_Connection_Purging/client2.cpp
+++ b/TAO/tests/Server_Connection_Purging/client2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 263256e1d5b..1a3d909fe58 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 464133475b6..203c02e3b4d 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index f3a5cc20a6f..b399bf730af 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index b2f1c39fbbf..94aa99fb5ab 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Ping_Service.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc b/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
index 4790e24fc4a..5f065f095f7 100644
--- a/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
+++ b/TAO/tests/Server_Port_Zero/Server_Port_Zero.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver {
Source_Files {
Hello.cpp
diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 8bc92fedd9d..3b4714ef588 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index f685a64e73e..4fe4455be92 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index a7da7ced2c7..a2c13bc6ef7 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "testC.h"
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 455d25e9e97..9c2ecff4477 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 5ff43da0a20..fd901f80264 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Skeleton_Inheritance/client.cpp b/TAO/tests/Skeleton_Inheritance/client.cpp
index d09c7da24f6..88470f91f65 100644
--- a/TAO/tests/Skeleton_Inheritance/client.cpp
+++ b/TAO/tests/Skeleton_Inheritance/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "idl_3C.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
index d4a5267eea0..dff1368f8de 100644
--- a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "interface_3_i.h"
interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
diff --git a/TAO/tests/Skeleton_Inheritance/server.cpp b/TAO/tests/Skeleton_Inheritance/server.cpp
index d9b0660b7a4..93982a91f8f 100644
--- a/TAO/tests/Skeleton_Inheritance/server.cpp
+++ b/TAO/tests/Skeleton_Inheritance/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "interface_3_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
index 50f5129edc9..19784063af5 100644
--- a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
+++ b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(idl_one_gen): taoidldefaults {
custom_only = 1
diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
index 920c81e7db3..49e5e982882 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
+++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index b6accb28b45..9af4c84e1ce 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
Smart_Test_Factory::Smart_Test_Factory (void)
{
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index 2ba06e0df97..af205ea5619 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
{
diff --git a/TAO/tests/Smart_Proxies/Benchmark/test.idl b/TAO/tests/Smart_Proxies/Benchmark/test.idl
index 5bcb1fa79dd..5c954463b51 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/test.idl
+++ b/TAO/tests/Smart_Proxies/Benchmark/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index e7ddda5bbf0..0cf604ac6c9 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 96366bd6f15..f7b8a7f346e 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -1,5 +1,3 @@
-// $Id$
-
//============================================================================
//
// =FILENAME
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.idl b/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
index 0e60b25c52c..8b0072e4a90 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Diamond
{
interface Top
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index 0200835d0a8..76500e00431 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Diamond_i.h"
Top_i::Top_i ()
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 9896ece35c6..354ae97d32b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#if !defined (TAO_DIAMOND_I_H)
#define TAO_DIAMOND_I_H
diff --git a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
index 765052118d0..181d2678d73 100644
--- a/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
+++ b/TAO/tests/Smart_Proxies/Collocation/SP_Collocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
idlflags += -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index fc629e39647..bcda296ad7f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 539b46165a7..1dd3fc82864 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -1,4 +1,3 @@
-// $Id$
//
#ifndef SMART_PROXY_IMPL_H
#define SMART_PROXY_IMPL_H
diff --git a/TAO/tests/Smart_Proxies/Collocation/diamond_export.h b/TAO/tests/Smart_Proxies/Collocation/diamond_export.h
index fff24d8a0e5..78ba933286c 100644
--- a/TAO/tests/Smart_Proxies/Collocation/diamond_export.h
+++ b/TAO/tests/Smart_Proxies/Collocation/diamond_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index d5eceaf8341..11c916abe48 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Coll_Tester.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/tests/Smart_Proxies/Collocation/stub_export.h b/TAO/tests/Smart_Proxies/Collocation/stub_export.h
index 2242f4a184e..ca0093d192c 100644
--- a/TAO/tests/Smart_Proxies/Collocation/stub_export.h
+++ b/TAO/tests/Smart_Proxies/Collocation/stub_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
index d9f66a381ff..b60757cf94f 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
+++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 245458f38a4..689bdf84d5b 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Smart_Proxy_Impl.h"
Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index 289adfea298..ab6e3d51dcd 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index 21f7cef8bef..c982fedccc3 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
#include "ace/Service_Object.h"
#include "ace/svc_export.h"
diff --git a/TAO/tests/Smart_Proxies/On_Demand/test.idl b/TAO/tests/Smart_Proxies/On_Demand/test.idl
index 0f8886ac634..350c9ce76b9 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/test.idl
+++ b/TAO/tests/Smart_Proxies/On_Demand/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
index 920c81e7db3..49e5e982882 100644
--- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
+++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 3edc23f2103..4eb3378faa4 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory)
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index ba291b7d2b4..2f64d451b43 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
diff --git a/TAO/tests/Smart_Proxies/Policy/test.idl b/TAO/tests/Smart_Proxies/Policy/test.idl
index 6d98cb1223c..91045954780 100644
--- a/TAO/tests/Smart_Proxies/Policy/test.idl
+++ b/TAO/tests/Smart_Proxies/Policy/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index 2529b667c8d..370cf25e13e 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, smart_proxies {
IDL_Files {
test.idl
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 36e3158ea0f..479385bf9da 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Smart_Proxy_Impl.h"
ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior");
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 4000212331e..6059b92b107 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Smart_Proxies/test.idl b/TAO/tests/Smart_Proxies/test.idl
index 6d98cb1223c..91045954780 100644
--- a/TAO/tests/Smart_Proxies/test.idl
+++ b/TAO/tests/Smart_Proxies/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// = TITLE
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index e9da8b404fa..65b758f4edf 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index 5f7e03858c6..8b5fd8d0389 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index 93f40f4df09..eb309a0ca67 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender.h"
#include "Server_Task.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp
index d3b3221a76d..45fd111d431 100644
--- a/TAO/tests/Storable/Savable.cpp
+++ b/TAO/tests/Storable/Savable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Savable.h"
#include "tao/Storable_Base.h"
#include "tao/Storable_Factory.h"
diff --git a/TAO/tests/Storable/Savable.h b/TAO/tests/Storable/Savable.h
index 82aad1f6c7d..39f3c573bdc 100644
--- a/TAO/tests/Storable/Savable.h
+++ b/TAO/tests/Storable/Savable.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Storable_Base.h"
#include "tao/Storable_Factory.h"
diff --git a/TAO/tests/Storable/Storable.mpc b/TAO/tests/Storable/Storable.mpc
index 8dc0de72161..a063a138ca7 100644
--- a/TAO/tests/Storable/Storable.mpc
+++ b/TAO/tests/Storable/Storable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoclient {
exename = test
}
diff --git a/TAO/tests/Storable/test.cpp b/TAO/tests/Storable/test.cpp
index bb57d1adde0..0748cb9b409 100644
--- a/TAO/tests/Storable/test.cpp
+++ b/TAO/tests/Storable/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Assumed to be one of two processes that
// writes/reads from persistent store.
// Each process writes one group of attributes
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index df4ff8ecdf3..529d9cbc4da 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
simple_test.idl
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 7d1dd8c33bf..1ef663928e2 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
#include "simple_testC.h"
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 75cf6830738..bee0491382e 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "simple_test_i.h"
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index bbb6b1c07fb..f4292f5454b 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "simple_test_i.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Strategies/simple_test_i.inl b/TAO/tests/Strategies/simple_test_i.inl
index ed9a04eb108..60169bc2be1 100644
--- a/TAO/tests/Strategies/simple_test_i.inl
+++ b/TAO/tests/Strategies/simple_test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/tests/Time_Policy/Time_Policy.mpc b/TAO/tests/Time_Policy/Time_Policy.mpc
index d6bb48b97f2..fce09ec4ce7 100644
--- a/TAO/tests/Time_Policy/Time_Policy.mpc
+++ b/TAO/tests/Time_Policy/Time_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Exe): taoserver {
exename = test
Source_Files {
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
index 2124c1b7605..f0d7d6fcfc8 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Lib): taolib {
sharedname = CustomTimePolicy
dynamicflags = TPTEST_BUILD_DLL
diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
index 9eae626747a..803f6e98555 100644
--- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
+++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Custom_Time_Policy_Strategy.h"
#include "ace/Timer_Heap_T.h"
diff --git a/TAO/tests/Time_Policy_Custom/TPTest_Export.h b/TAO/tests/Time_Policy_Custom/TPTest_Export.h
index 4dcfe63f844..160f8730653 100644
--- a/TAO/tests/Time_Policy_Custom/TPTest_Export.h
+++ b/TAO/tests/Time_Policy_Custom/TPTest_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TPTEST
// ------------------------------
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 5178bae4ddf..5ec2b0e098e 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 612df69b35f..ab89abebe3a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index 62fce048a11..59e6db0265c 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 0c95ddf25e6..99ff723e7e1 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index a5b94214917..6faa56e1516 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 1e66973cff6..b592a4416c9 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index 4dec77755fe..829ad2298e3 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_unistd.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index b3f28bd21f5..8674b995e7a 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/TCC.h"
#include "Current_Test_Impl.h"
diff --git a/TAO/tests/TransportCurrent/Framework/Framework.mpc b/TAO/tests/TransportCurrent/Framework/Framework.mpc
index 93b74f884a0..e8b10317176 100644
--- a/TAO/tests/TransportCurrent/Framework/Framework.mpc
+++ b/TAO/tests/TransportCurrent/Framework/Framework.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tc, pi_server {
after += Current_Test_Lib_Client Current_Test_Lib_Server
libs += Current_Test_Lib_Client Current_Test_Lib_Server
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index c6d7ad97d0f..133d33b4aa2 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
/// Prototype
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index a17fec6c9d2..2e08cbe97f2 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TransportCurrent/Transport_Current.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index 48b63aaba8e..87cd0ed6803 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index f4f14a14a7a..bf76a489a6d 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 4a121500240..5c9f92d54b9 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/ORB.h"
#include "tao/Object.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index 82f2f56d9ea..9d3e9ab646e 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/TC_IIOPC.h"
#include "tao/TransportCurrent/TCC.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
index 4449c98e225..e96ab5a8bc5 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tc_iiop, pi_server {
after += Current_Test_Lib_Client Current_Test_Lib_Server
libs += Current_Test_Lib_Client Current_Test_Lib_Server
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index 3005a704841..060175b7518 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "IIOP_Server_Request_Interceptor.h"
/// Prototype
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index b0918b36806..4e1a630dd06 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "tao/ORB_Constants.h"
#include "tao/TransportCurrent/TC_IIOPC.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
index c2ad72bc867..fc92ac1c7e0 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/TransportCurrent/IIOP_Transport_Current.h"
#include "tao/SystemException.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index 5faa5e6ca69..e627b4e8bd5 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index ec3f6611858..122086f513d 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Task.h"
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index d137ab4288c..2eb5c6e8d19 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Client_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index db233e7864e..5374a39a00f 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Current_TestC.h"
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
index cfdf16fe60e..cfe9d2786a6 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -d Current_Test
// ------------------------------
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
index e2806575743..4ea23ea285b 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
dynamicflags += CURRENT_TEST_BUILD_DLL
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index c8d3752852d..f15ce0662e4 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 13a739ca479..17064f19bbe 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Log_Msg.h"
#include "Server_Request_Interceptor.h"
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
index cedde496a0d..77e6554d86c 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
index 2d152550002..27c5a224c32 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/SString.h"
diff --git a/TAO/tests/Transport_Cache_Manager/TCM.mpc b/TAO/tests/Transport_Cache_Manager/TCM.mpc
index b8325dce8cb..c26c4850277 100644
--- a/TAO/tests/Transport_Cache_Manager/TCM.mpc
+++ b/TAO/tests/Transport_Cache_Manager/TCM.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Bug_3549_Regression): taoclient {
exename = Bug_3549_Regression
Source_Files {
diff --git a/TAO/tests/Transport_Cache_Manager/mock_ps.h b/TAO/tests/Transport_Cache_Manager/mock_ps.h
index 1ac46cc79ab..a5cd90a8d65 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_ps.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_ps.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_ps
{
public:
diff --git a/TAO/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
index 341b9b31626..91e4b79d78e 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_tdi
{
public:
diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h
index 58460704e1d..6ad84edf323 100644
--- a/TAO/tests/Transport_Cache_Manager/mock_transport.h
+++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h
@@ -1,5 +1,3 @@
-// $Id$
-
class mock_transport
{
public:
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index a4cc32c1562..7fe7a2364e5 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Second_i.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 6739a263ca4..06635ee07bc 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Two_Objects.idl
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index 72213d9df43..34f7b8cb30f 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Two_ObjectsC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index c1713a14618..165b1cb0d2a 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "worker.h"
#include "Object_Factory_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index a405d915563..716034e780d 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index 8e9538a4c4f..15de0999914 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "testImpl.h"
diff --git a/TAO/tests/Typedef_String_Array/test.idl b/TAO/tests/Typedef_String_Array/test.idl
index 776cebb3be0..c79e4fd291e 100644
--- a/TAO/tests/Typedef_String_Array/test.idl
+++ b/TAO/tests/Typedef_String_Array/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Either of these sets will work, but only the last one
// demonstrates the original tao_idl problem.
diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp
index 5256013a259..17975281fa9 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.cpp
+++ b/TAO/tests/Typedef_String_Array/testImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testImpl.h"
static const CORBA::ULong maxd = 15;
diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h
index acbd61ef1cc..41102029d1e 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.h
+++ b/TAO/tests/Typedef_String_Array/testImpl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testS.h"
class TestImpl: public POA_SimpleStrings
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index fbd82f97a5f..c658edff84a 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index f07c72a056d..05b94b8c451 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index 9895a7b8a02..f754670339e 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index df224db010e..6e6a3f0066a 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testS.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index 6d3de01204b..b539334d7f8 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Control.h"
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index aa6ff78ed24..fb6095fd925 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Stopwatch_display.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index 5d3847ad5f6..b82f5515288 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoserver, tao_xtresource, ace_motif {
Source_Files {
test_i.cpp
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 61b62cb138a..7dd4d0ad804 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index f42ca6922a7..4158a3b7318 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/Xt_Stopwatch/test.idl b/TAO/tests/Xt_Stopwatch/test.idl
index a3fffd63f86..108a1974d9f 100644
--- a/TAO/tests/Xt_Stopwatch/test.idl
+++ b/TAO/tests/Xt_Stopwatch/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Stopwatch
{
void start ();
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index aa38cd96551..4f617855354 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
index b5a32600deb..1be147c9308 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCompressor.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
index 6f85faea948..471d36cde19 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestCompressor_Factory.h"
#include "TestCompressor.h"
diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h b/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h
index 47490000514..179247f0e4c 100644
--- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h
+++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/tests/ZIOP/ZIOP.mpc b/TAO/tests/ZIOP/ZIOP.mpc
index 3c5af503912..b9cee219f6d 100644
--- a/TAO/tests/ZIOP/ZIOP.mpc
+++ b/TAO/tests/ZIOP/ZIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TestCompressor) : taolib, compression, taoidldefaults {
sharedname = TAO_TestCompressor
dynamicflags += TAO_TESTCOMPRESSOR_BUILD_DLL
diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp
index b2fdcef6e1a..38fcf9db330 100644
--- a/TAO/tests/ZIOP/client.cpp
+++ b/TAO/tests/ZIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/ZIOP/ZIOP.h"
diff --git a/TAO/tests/ZIOP/common.h b/TAO/tests/ZIOP/common.h
index f896f7650da..42a3b039cb2 100644
--- a/TAO/tests/ZIOP/common.h
+++ b/TAO/tests/ZIOP/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#define CLIENT_COMPRESSION_LEVEL 7
#define SERVER_COMPRESSION_LEVEL 5
#define LEAST_COMPRESSION_LEVEL ((CLIENT_COMPRESSION_LEVEL < SERVER_COMPRESSION_LEVEL) ?\
diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp
index cdce279b1dc..996abbf3847 100644
--- a/TAO/tests/ZIOP/server.cpp
+++ b/TAO/tests/ZIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/tests/objref_comparison_test/foo.idl b/TAO/tests/objref_comparison_test/foo.idl
index 6c5acbe1288..7f4177c6e84 100644
--- a/TAO/tests/objref_comparison_test/foo.idl
+++ b/TAO/tests/objref_comparison_test/foo.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FOO_IDL
#define FOO_IDL
diff --git a/TAO/tests/objref_comparison_test/main.cpp b/TAO/tests/objref_comparison_test/main.cpp
index 54b1d15a379..482e8516000 100644
--- a/TAO/tests/objref_comparison_test/main.cpp
+++ b/TAO/tests/objref_comparison_test/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Functor.h"
#include "ace/Task.h"
#include "fooS.h"
diff --git a/TAO/tests/objref_comparison_test/objref_comparison_test.mpc b/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
index ef0f0475c56..ac4087ec1a8 100644
--- a/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
+++ b/TAO/tests/objref_comparison_test/objref_comparison_test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoserver {
Source_Files {
main.cpp
diff --git a/TAO/utils/NamingViewer/AddNameServerDlg.cpp b/TAO/utils/NamingViewer/AddNameServerDlg.cpp
index 556de52aaca..132f14a3600 100644
--- a/TAO/utils/NamingViewer/AddNameServerDlg.cpp
+++ b/TAO/utils/NamingViewer/AddNameServerDlg.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "AddNameServerDlg.h"
diff --git a/TAO/utils/NamingViewer/AddNameServerDlg.h b/TAO/utils/NamingViewer/AddNameServerDlg.h
index d76174b446c..56b86500e2d 100644
--- a/TAO/utils/NamingViewer/AddNameServerDlg.h
+++ b/TAO/utils/NamingViewer/AddNameServerDlg.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_ADDNAMESERVERDLG_H__2AF5C355_B440_11D3_BF2C_00C0F03C565A__INCLUDED_)
#define AFX_ADDNAMESERVERDLG_H__2AF5C355_B440_11D3_BF2C_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index 8c578e672c9..77eb1f35f31 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "BindDialog.h"
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index a8e80a8e56e..27ce08764ee 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_BINDDIALOG_H__1F34ADC5_B0D8_11D3_BF27_00C0F03C565A__INCLUDED_)
#define AFX_BINDDIALOG_H__1F34ADC5_B0D8_11D3_BF27_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index 0746f4a42f6..ba797c7ae88 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -1,4 +1,3 @@
-// $Id$
// BindNewContext.cpp : implementation file
#include "stdafx.h"
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index b94ca864732..637823c89d0 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_BINDNEWCONTEXT_H__2AF5C352_B440_11D3_BF2C_00C0F03C565A__INCLUDED_)
#define AFX_BINDNEWCONTEXT_H__2AF5C352_B440_11D3_BF2C_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/NamingObject.cpp b/TAO/utils/NamingViewer/NamingObject.cpp
index 3d47d9ca2c6..b67dcb5e3ef 100644
--- a/TAO/utils/NamingViewer/NamingObject.cpp
+++ b/TAO/utils/NamingViewer/NamingObject.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index 5dd5a1fed27..dec96a57aa2 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -1,4 +1,3 @@
-// $Id$
// NamingObject.h: interface for the CNamingObject class.
//////////////////////////////////////////////////////////////////////
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index f967a042b23..2a7f2791148 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "NamingTreeCtrl.h"
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h
index 8afe055bf01..21885ca90ae 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.h
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_NAMINGTREECTRL_H__1F34ADC2_B0D8_11D3_BF27_00C0F03C565A__INCLUDED_)
#define AFX_NAMINGTREECTRL_H__1F34ADC2_B0D8_11D3_BF27_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index b1a22982602..9521287266b 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "NamingViewerDlg.h"
diff --git a/TAO/utils/NamingViewer/NamingViewer.h b/TAO/utils/NamingViewer/NamingViewer.h
index e45772851fc..145cc45111d 100644
--- a/TAO/utils/NamingViewer/NamingViewer.h
+++ b/TAO/utils/NamingViewer/NamingViewer.h
@@ -1,4 +1,3 @@
-// $Id$
// NamingViewer.h : main header file for the NAMINGVIEWER application
//
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 51dd9b64af9..802a7baf205 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : namingexe, ace_mfc {
exename = NamingViewer
install = $(ACE_ROOT)/bin
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index 0e312e51722..ad8f422ae33 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "NamingViewerDlg.h"
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index 1b535d519d1..97c8ce23812 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -1,4 +1,3 @@
-// $Id$
// NamingViewerDlg.h : header file
//
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp
index fe343ce44b2..ab5f2cbc154 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.cpp
+++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp
@@ -1,4 +1,3 @@
-// $Id$
// SelectNSDialog.cpp : implementation file
//
diff --git a/TAO/utils/NamingViewer/SelectNSDialog.h b/TAO/utils/NamingViewer/SelectNSDialog.h
index 27a90c4a599..acee77ff4f2 100644
--- a/TAO/utils/NamingViewer/SelectNSDialog.h
+++ b/TAO/utils/NamingViewer/SelectNSDialog.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_SELECTNSDIALOG_H__2AF5C353_B440_11D3_BF2C_00C0F03C565A__INCLUDED_)
#define AFX_SELECTNSDIALOG_H__2AF5C353_B440_11D3_BF2C_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/StdAfx.cpp b/TAO/utils/NamingViewer/StdAfx.cpp
index a0d86b1a5ce..51dc942d791 100644
--- a/TAO/utils/NamingViewer/StdAfx.cpp
+++ b/TAO/utils/NamingViewer/StdAfx.cpp
@@ -1,4 +1,3 @@
-// $Id$
// stdafx.cpp : source file that includes just the standard includes
// NamingViewer.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/TAO/utils/NamingViewer/StdAfx.h b/TAO/utils/NamingViewer/StdAfx.h
index 3bd46cfb1ef..0c150277277 100644
--- a/TAO/utils/NamingViewer/StdAfx.h
+++ b/TAO/utils/NamingViewer/StdAfx.h
@@ -1,4 +1,3 @@
-// $Id$
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index e1c645d0788..b3bc5f4f764 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "stdafx.h"
#include "NamingViewer.h"
#include "ViewIORDialog.h"
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.h b/TAO/utils/NamingViewer/ViewIORDialog.h
index dced6811462..a49de2b8724 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.h
+++ b/TAO/utils/NamingViewer/ViewIORDialog.h
@@ -1,4 +1,3 @@
-// $Id$
#if !defined(AFX_VIEWIORDIALOG_H__A010D782_AF86_11D3_BF23_00C0F03C565A__INCLUDED_)
#define AFX_VIEWIORDIALOG_H__A010D782_AF86_11D3_BF23_00C0F03C565A__INCLUDED_
diff --git a/TAO/utils/NamingViewer/resource.h b/TAO/utils/NamingViewer/resource.h
index 379585f672a..d690b8e1332 100644
--- a/TAO/utils/NamingViewer/resource.h
+++ b/TAO/utils/NamingViewer/resource.h
@@ -1,4 +1,3 @@
-// $Id$
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by NamingViewer.rc
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 20a190f0be8..bdb9a96ecae 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = LIBRARY
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index 2c6a74c9c6b..edea079c4ad 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*lib): tao_output, rtcorba, install, messaging, ziop {
// This library used to be called TAO_Catior. But due to the 'vxtest'
// project type, it had to be renamed to avoid conflicting with the
diff --git a/TAO/utils/catior/catior_export.h b/TAO/utils/catior/catior_export.h
index 11da2ad364d..231bef8b476 100644
--- a/TAO/utils/catior/catior_export.h
+++ b/TAO/utils/catior/catior_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl catior
// ------------------------------
diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp
index a5ecf8606ae..fa199d2bfbd 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.cpp
+++ b/TAO/utils/logWalker/GIOP_Buffer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "GIOP_Buffer.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/utils/logWalker/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h
index 1e1386374c5..0c9f9002671 100644
--- a/TAO/utils/logWalker/GIOP_Buffer.h
+++ b/TAO/utils/logWalker/GIOP_Buffer.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_GIOP_BUFFER_H
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index f8b55d99ce7..93f232fa4c1 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "HostProcess.h"
#include "Invocation.h"
#include "PeerProcess.h"
diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h
index 3ae936ee648..7cfb50283d8 100644
--- a/TAO/utils/logWalker/HostProcess.h
+++ b/TAO/utils/logWalker/HostProcess.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_HOST_PROCESS_H
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index 5364d2c1914..ffdc786823a 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Invocation.h"
#include "GIOP_Buffer.h"
#include "PeerProcess.h"
diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h
index 278b30d7dec..e88292117cb 100644
--- a/TAO/utils/logWalker/Invocation.h
+++ b/TAO/utils/logWalker/Invocation.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_INVOCATION_H
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 0d66aeda899..6a5e322c5c8 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log.h"
#include "Invocation.h"
#include "PeerProcess.h"
diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h
index 57cccfb8c74..c7c44d501c5 100644
--- a/TAO/utils/logWalker/Log.h
+++ b/TAO/utils/logWalker/Log.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_LOG_H
diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp
index 11df9a0b8fb..3d15be1db38 100644
--- a/TAO/utils/logWalker/PeerObject.cpp
+++ b/TAO/utils/logWalker/PeerObject.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PeerObject.h"
#include "Invocation.h"
diff --git a/TAO/utils/logWalker/PeerObject.h b/TAO/utils/logWalker/PeerObject.h
index cffcfe1c6e9..1567861d9f3 100644
--- a/TAO/utils/logWalker/PeerObject.h
+++ b/TAO/utils/logWalker/PeerObject.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_PEER_OBJECT_H
diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp
index 3d4dbfac7ce..999a5974563 100644
--- a/TAO/utils/logWalker/PeerProcess.cpp
+++ b/TAO/utils/logWalker/PeerProcess.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PeerProcess.h"
#include "PeerObject.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/utils/logWalker/PeerProcess.h b/TAO/utils/logWalker/PeerProcess.h
index 91378d7d9dd..cd94fd9c9b5 100644
--- a/TAO/utils/logWalker/PeerProcess.h
+++ b/TAO/utils/logWalker/PeerProcess.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_PEER_PROCESS_H
diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp
index e9490844ad4..0d1a7549f3c 100644
--- a/TAO/utils/logWalker/Session.cpp
+++ b/TAO/utils/logWalker/Session.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session.h"
#include "HostProcess.h"
#include "PeerProcess.h"
diff --git a/TAO/utils/logWalker/Session.h b/TAO/utils/logWalker/Session.h
index bfb8c8da6aa..b10b3f7e8c7 100644
--- a/TAO/utils/logWalker/Session.h
+++ b/TAO/utils/logWalker/Session.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_SESSION_H
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index 3bd7f206ef4..9149e3e3568 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Thread.h"
#include "Invocation.h"
#include "PeerProcess.h"
diff --git a/TAO/utils/logWalker/Thread.h b/TAO/utils/logWalker/Thread.h
index 180bd1bfc43..844ab1ade4a 100644
--- a/TAO/utils/logWalker/Thread.h
+++ b/TAO/utils/logWalker/Thread.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
//
#ifndef LOG_WALKER_THREAD_H
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index b669c89c1d3..20f0d07525d 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Utility to traverse and simplify verbose log files.
//
// The goal is to take a collection of log files and extract details
diff --git a/TAO/utils/logWalker/logWalker.mpc b/TAO/utils/logWalker/logWalker.mpc
index d97d8fb2bdf..a4f55b6fcdb 100644
--- a/TAO/utils/logWalker/logWalker.mpc
+++ b/TAO/utils/logWalker/logWalker.mpc
@@ -1,6 +1,4 @@
// -*- mpc -*-
-// $Id$
-
project : aceexe, avoids_ace_for_tao {
exename = tao_logWalker
install = $(ACE_ROOT)/bin
diff --git a/TAO/utils/monitor/monitor.mpc b/TAO/utils/monitor/monitor.mpc
index a0cb1d7449b..78d11f2e8a4 100644
--- a/TAO/utils/monitor/monitor.mpc
+++ b/TAO/utils/monitor/monitor.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(monitor_client): taoexe, tao_monitor, strategies {
Source_Files {
monitor_client.cpp
diff --git a/TAO/utils/monitor/monitor_client.cpp b/TAO/utils/monitor/monitor_client.cpp
index 3bb2643e476..cc9999e14f0 100644
--- a/TAO/utils/monitor/monitor_client.cpp
+++ b/TAO/utils/monitor/monitor_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/streams.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/utils/nsgroup/nsgroup.mpc b/TAO/utils/nsgroup/nsgroup.mpc
index 490334f5247..0ab864cf75b 100644
--- a/TAO/utils/nsgroup/nsgroup.mpc
+++ b/TAO/utils/nsgroup/nsgroup.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(nsgroup): orbsvcsexe, ftnaming, naming, install, svc_utils {
install = $(ACE_ROOT)/bin
exename = tao_nsgroup
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index 5c4ae30c058..0a58a51c85b 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(nsadd): namingexe, install {
install = $(ACE_ROOT)/bin
exename = tao_nsadd
diff --git a/TAO/utils/wxNamingViewer/pch.h b/TAO/utils/wxNamingViewer/pch.h
index 83e34dac513..e99aa1be3e7 100644
--- a/TAO/utils/wxNamingViewer/pch.h
+++ b/TAO/utils/wxNamingViewer/pch.h
@@ -1,4 +1,3 @@
-// $Id$
// pch.h
#ifndef i_pch_h
diff --git a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.h b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.h
index 9269c997b4b..6ca3a8cc04d 100644
--- a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.h
+++ b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.h
@@ -1,4 +1,3 @@
-// $Id$
// wxAddNameServerDlg.h
#ifndef i_wxAddNameServerDlg_h
diff --git a/TAO/utils/wxNamingViewer/wxAutoDialog.h b/TAO/utils/wxNamingViewer/wxAutoDialog.h
index a649c19172d..a1e59cce11c 100644
--- a/TAO/utils/wxNamingViewer/wxAutoDialog.h
+++ b/TAO/utils/wxNamingViewer/wxAutoDialog.h
@@ -1,4 +1,3 @@
-// $Id$
// wxAutoDialog.h
#ifndef i_wxAutoDialog_h
diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.h b/TAO/utils/wxNamingViewer/wxBindDialog.h
index a1a07afe1e4..4ad7f4f0f65 100644
--- a/TAO/utils/wxNamingViewer/wxBindDialog.h
+++ b/TAO/utils/wxNamingViewer/wxBindDialog.h
@@ -1,4 +1,3 @@
-// $Id$
// wxBindDialog.h
#ifndef i_wxBindDialog_h
diff --git a/TAO/utils/wxNamingViewer/wxBindNewContext.h b/TAO/utils/wxNamingViewer/wxBindNewContext.h
index f74a38e131f..8c68e8f6317 100644
--- a/TAO/utils/wxNamingViewer/wxBindNewContext.h
+++ b/TAO/utils/wxNamingViewer/wxBindNewContext.h
@@ -1,4 +1,3 @@
-// $Id$
// wxBindNewContext.h
#ifndef i_wxBindNewContext_h
diff --git a/TAO/utils/wxNamingViewer/wxNamingObject.cpp b/TAO/utils/wxNamingViewer/wxNamingObject.cpp
index adff88529e5..467e1169188 100644
--- a/TAO/utils/wxNamingViewer/wxNamingObject.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingObject.cpp
@@ -1,4 +1,3 @@
-// $Id$
// wxNamingObject.cpp
#include "pch.h"
diff --git a/TAO/utils/wxNamingViewer/wxNamingObject.h b/TAO/utils/wxNamingViewer/wxNamingObject.h
index 3daee322c6f..2a65a0eb6d9 100644
--- a/TAO/utils/wxNamingViewer/wxNamingObject.h
+++ b/TAO/utils/wxNamingViewer/wxNamingObject.h
@@ -1,4 +1,3 @@
-// $Id$
// wxNamingObject.h
#ifndef i_wxNamingObject_h
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.h b/TAO/utils/wxNamingViewer/wxNamingTree.h
index e04e2282cfa..b048a03ebe2 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.h
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.h
@@ -1,4 +1,3 @@
-// $Id$
// wxNamingTree.h
#ifndef i_wxNamingTree_h
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.h b/TAO/utils/wxNamingViewer/wxNamingViewer.h
index dc39dc2cb03..213723965f1 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewer.h
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.h
@@ -1,4 +1,3 @@
-// $Id$
/*
* wxNamingViewer.h
* Window identifiers file written by Dialog Editor
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.mpc b/TAO/utils/wxNamingViewer/wxNamingViewer.mpc
index 3d43adbb4a5..e0dfe6ac3bc 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewer.mpc
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, portableserver, wxwindows {
exename = wxNamingViewer
} \ No newline at end of file
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.h b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.h
index f3c316a8252..e69fec6731a 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.h
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.h
@@ -1,4 +1,3 @@
-// $Id$
// wxNamingViewerFrame.h
#ifndef i_wxNamingViewerFrame_h
diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.h b/TAO/utils/wxNamingViewer/wxSelectNSDialog.h
index b4e2eea2f47..8052483bc73 100644
--- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.h
+++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.h
@@ -1,4 +1,3 @@
-// $Id$
// wxSelectNSDialog.h
#ifndef i_WxSelectNSDialog_h
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.h b/TAO/utils/wxNamingViewer/wxViewIORDialog.h
index facd56e2efa..dc9f213339a 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.h
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.h
@@ -1,4 +1,3 @@
-// $Id$
// wxViewIORDialog.h
#ifndef i_wxViewIORDialog_h