summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/AMH_Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/AMH/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_i.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/inner_i.h2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle_i.cpp2
-rw-r--r--TAO/DevGuideExamples/AMH_AMI/middle_i.h2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/GettingStarted/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/RTCORBA/Messenger_i.h2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp2
-rw-r--r--TAO/DevGuideExamples/SmartProxies/Messenger_i.h2
-rw-r--r--TAO/TAO-INSTALL.html2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_arg_traits.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_template_export.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_traits.cpp2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_arg_traits.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h2
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_traits.h2
-rw-r--r--TAO/TAO_IDL/fe/fe_lookup.cpp2
-rw-r--r--TAO/TAO_IDL/fe/lex.yy.cpp2
-rwxr-xr-xTAO/bin/rm_exception_macros.pl2
-rw-r--r--TAO/docs/INS.html2
-rw-r--r--TAO/docs/LocalObject.html2
-rw-r--r--TAO/docs/ORBEndpoint.html2
-rw-r--r--TAO/docs/ORB_Internals.html2
-rw-r--r--TAO/docs/Options.html2
-rw-r--r--TAO/docs/Security/Conformance.html2
-rw-r--r--TAO/docs/Security/Download.html2
-rw-r--r--TAO/docs/Security/FAQ.html2
-rw-r--r--TAO/docs/Security/SSLIOP-INSTALL.html2
-rw-r--r--TAO/docs/Security/SSLIOP-USAGE.html2
-rw-r--r--TAO/docs/Security/SSLIOP.html2
-rw-r--r--TAO/docs/Security/Security_Service.html2
-rw-r--r--TAO/docs/Security/fireworks/nav_bar.html2
-rw-r--r--TAO/docs/Security/index.html2
-rw-r--r--TAO/docs/Smart_Proxies.html2
-rw-r--r--TAO/docs/TAO-metrics.html2
-rw-r--r--TAO/docs/TAO-tutorials.html2
-rw-r--r--TAO/docs/Tags.html2
-rw-r--r--TAO/docs/cec_options.html2
-rw-r--r--TAO/docs/compiler.html2
-rw-r--r--TAO/docs/components.html2
-rw-r--r--TAO/docs/configurations.html2
-rw-r--r--TAO/docs/documentation.html2
-rw-r--r--TAO/docs/dynany/index.html2
-rw-r--r--TAO/docs/ec_options.html2
-rw-r--r--TAO/docs/es_configs.html2
-rw-r--r--TAO/docs/events_tutorial.html2
-rw-r--r--TAO/docs/exceptions.html2
-rw-r--r--TAO/docs/forwarding.html2
-rw-r--r--TAO/docs/implrepo/index.html2
-rw-r--r--TAO/docs/implrepo/paper.html2
-rw-r--r--TAO/docs/implrepo/tao_imr.html2
-rw-r--r--TAO/docs/implrepo/usersguide.html2
-rw-r--r--TAO/docs/index.html2
-rw-r--r--TAO/docs/interceptors.html2
-rw-r--r--TAO/docs/interfacerepo/index.html2
-rw-r--r--TAO/docs/interfacerepo/tao_ifr.html2
-rw-r--r--TAO/docs/ior_parsing.html2
-rw-r--r--TAO/docs/leader_follower.html2
-rw-r--r--TAO/docs/libraries.html2
-rw-r--r--TAO/docs/locate_request.html2
-rw-r--r--TAO/docs/minimumTAO.html2
-rw-r--r--TAO/docs/notification/monitor.html2
-rw-r--r--TAO/docs/notification/reliability.html2
-rw-r--r--TAO/docs/notification/using_monitor_extensions.html2
-rw-r--r--TAO/docs/orbsvcs.html2
-rw-r--r--TAO/docs/performance.html2
-rw-r--r--TAO/docs/pluggable_messaging.html2
-rw-r--r--TAO/docs/pluggable_protocols/index.html2
-rw-r--r--TAO/docs/poa_migration.html2
-rw-r--r--TAO/docs/reactivator.html2
-rw-r--r--TAO/docs/releasenotes.html2
-rw-r--r--TAO/docs/releasenotes/OBV.html2
-rw-r--r--TAO/docs/releasenotes/PSS.html2
-rw-r--r--TAO/docs/releasenotes/RTCorba.html2
-rw-r--r--TAO/docs/releasenotes/TODO.html2
-rw-r--r--TAO/docs/releasenotes/amh.html2
-rw-r--r--TAO/docs/releasenotes/ec.html2
-rwxr-xr-xTAO/docs/releasenotes/ftcorba_services.html2
-rw-r--r--TAO/docs/releasenotes/ftrt_ec.html2
-rw-r--r--TAO/docs/releasenotes/index.html2
-rw-r--r--TAO/docs/releasenotes/notify.html2
-rw-r--r--TAO/docs/releasenotes/orbcore.html2
-rw-r--r--TAO/docs/releasenotes/rtc10_sched.html2
-rw-r--r--TAO/docs/releasenotes/trader.html2
-rw-r--r--TAO/docs/rtcorba/architecture.html2
-rw-r--r--TAO/docs/rtcorba/content.html2
-rw-r--r--TAO/docs/rtcorba/faq.html2
-rw-r--r--TAO/docs/rtcorba/features.html2
-rw-r--r--TAO/docs/rtcorba/index.html2
-rw-r--r--TAO/docs/rtcorba/issues.html2
-rw-r--r--TAO/docs/rtcorba/omg_issues.html2
-rw-r--r--TAO/docs/rtcorba/status.html2
-rw-r--r--TAO/docs/transport_current/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/AMI/svc.conf.xml2
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml2
-rw-r--r--TAO/docs/tutorials/Quoter/Event_Service/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Naming_Service/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Common.idl2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/database.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/mpc.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/docs/run.html2
-rw-r--r--TAO/docs/tutorials/Quoter/RT_Event_Service/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Client/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Persistent/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/Simple/Server/index.html2
-rw-r--r--TAO/docs/tutorials/Quoter/index.html2
-rw-r--r--TAO/examples/AMH/Sink_Server/st_server.conf.xml2
-rw-r--r--TAO/examples/AMI/FL_Callback/peer.conf.xml2
-rw-r--r--TAO/examples/Buffered_AMI/svc.conf.xml2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml2
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/test.idl2
-rw-r--r--TAO/examples/Quoter/client.conf.xml2
-rw-r--r--TAO/examples/Quoter/server.conf.xml2
-rw-r--r--TAO/examples/Simple/time-date/client.conf.xml4
-rw-r--r--TAO/examples/Simple/time-date/svc.conf.xml2
-rw-r--r--TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html2
-rw-r--r--TAO/examples/Simulator/Event_Supplier/svc.conf.xml2
-rw-r--r--TAO/interop-tests/AnyTypeCode/build.xml2
-rw-r--r--TAO/interop-tests/wchar/build.xml2
-rw-r--r--TAO/orbsvcs/Concurrency_Service/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/InterfaceRepo/InterfaceRepo.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc2
-rw-r--r--TAO/orbsvcs/Event_Service/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/repository.xml2
-rw-r--r--TAO/orbsvcs/Notify_Service/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/TAO_Service/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Filter.cpp2
-rwxr-xr-xTAO/orbsvcs/examples/Notify/MC/TkMonitor/external_idl.pl2
-rwxr-xr-xTAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Pluggable_Framework.html2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTypedEventChannelAdmin.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTypedEventComm.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LB_ORT.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/eventlog_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/eventlog_serv_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/eventlog_skel_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/log_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/log_serv_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/log_skel_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/notifylog_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/notifylog_serv_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/notifylog_skel_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/rteventlog_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/constraint.y3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h4
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.y2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/control.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/observer.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/sched.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/latency.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ReconnectServer/build.xml2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf.xml2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Callback/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/DII/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/DSI/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/Deferred/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/default.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml2
-rw-r--r--TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml2
-rw-r--r--TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml2
-rw-r--r--TAO/performance-tests/Throughput/svc.conf.xml2
-rw-r--r--TAO/tao/Dynamic_TP/DTP_Task.h2
-rw-r--r--TAO/tao/ImR_Client/ImplRepo.idl2
-rw-r--r--TAO/tao/ImR_Client/ServerObject.idl2
-rw-r--r--TAO/tao/Invocation_Retry_Params.h2
-rw-r--r--TAO/tao/Invocation_Retry_State.h2
-rw-r--r--TAO/tao/Messaging/Messaging_Loader.h2
-rw-r--r--TAO/tao/ORB.cpp2
-rw-r--r--TAO/tao/Object.cpp2
-rw-r--r--TAO/tao/PI_Server/PI_Server_Loader.h2
-rw-r--r--TAO/tao/PolicyS.h2
-rw-r--r--TAO/tao/PortableServer/POA_Guard.h2
-rw-r--r--TAO/tao/PortableServer/RequestProcessingStrategy.cpp2
-rw-r--r--TAO/tao/TAO_Server_Request.h2
-rw-r--r--TAO/tao/Valuetype/AbstractBase.cpp2
-rw-r--r--TAO/tests/AMI/exclusive.conf.xml2
-rw-r--r--TAO/tests/AMI/exclusive_rw.conf.xml2
-rw-r--r--TAO/tests/AMI/muxed.conf.xml2
-rw-r--r--TAO/tests/AMI/server.conf.xml2
-rw-r--r--TAO/tests/AMI_Timeouts/svc.conf.xml2
-rw-r--r--TAO/tests/Big_Request_Muxing/svc.conf.xml2
-rw-r--r--TAO/tests/Bug_2122_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2124_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2126_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2669_Regression/Child.idl2
-rw-r--r--TAO/tests/Bug_2669_Regression/Parent.idl2
-rw-r--r--TAO/tests/Bug_2669_Regression/client.cpp2
-rwxr-xr-xTAO/tests/Bug_2678_Regression/dribble.pl2
-rw-r--r--TAO/tests/Bug_2936_Regression/PersistentPOA.cpp2
-rw-r--r--TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml2
-rw-r--r--TAO/tests/Bug_3276_Regression/test.idl2
-rw-r--r--TAO/tests/Bug_3470_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h2
-rw-r--r--TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h2
-rw-r--r--TAO/tests/Bug_3801_Regression/exclusive.conf.xml2
-rw-r--r--TAO/tests/Bug_3801_Regression/muxed.conf.xml2
-rw-r--r--TAO/tests/Bug_3801_Regression/server.conf.xml2
-rw-r--r--TAO/tests/Bug_3953_Regression/svc.conf.xml2
-rw-r--r--TAO/tests/CSD_Collocation/svc.conf.xml2
-rw-r--r--TAO/tests/Collocation/svc.conf.xml2
-rw-r--r--TAO/tests/Connect_Strategy_Test/blocked.conf.xml2
-rw-r--r--TAO/tests/Connect_Strategy_Test/reactor.conf.xml2
-rw-r--r--TAO/tests/Connection_Purging/client.fifo.conf.xml2
-rw-r--r--TAO/tests/Connection_Purging/client.lfu.conf.xml2
-rw-r--r--TAO/tests/Connection_Purging/client.lru.conf.xml2
-rw-r--r--TAO/tests/Connection_Purging/client.null.conf.xml2
-rw-r--r--TAO/tests/Connection_Purging/server_shmiop.conf.xml2
-rw-r--r--TAO/tests/DII_AMI_Forward/client.cpp2
-rw-r--r--TAO/tests/DII_AMI_Forward/test.idl2
-rwxr-xr-xTAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl2
-rw-r--r--TAO/tests/LongUpcalls/svc.conf.xml2
-rw-r--r--TAO/tests/MProfile/test.idl2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/test.idl2
-rw-r--r--TAO/tests/MProfile_Forwarding/test.idl2
-rw-r--r--TAO/tests/MT_BiDir/server.conf.xml2
-rw-r--r--TAO/tests/MT_Client/client.conf.xml2
-rw-r--r--TAO/tests/MT_Client/client_muxed.conf.xml2
-rw-r--r--TAO/tests/MT_Client/server.conf.xml2
-rw-r--r--TAO/tests/MT_Client/test.idl2
-rw-r--r--TAO/tests/MT_Server/server.conf.xml2
-rw-r--r--TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml2
-rw-r--r--TAO/tests/Muxing/svc.conf.xml2
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml2
-rw-r--r--TAO/tests/NestedUpcall/Simple/svc.conf.xml2
-rw-r--r--TAO/tests/Nested_Event_Loop/svc.conf.xml2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/test.idl2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml2
-rw-r--r--TAO/tests/ORT/ObjectReferenceFactory.h2
-rw-r--r--TAO/tests/Object_Loader/svc.conf.xml2
-rw-r--r--TAO/tests/OctetSeq/svc1.conf.xml2
-rw-r--r--TAO/tests/OctetSeq/svc2.conf.xml2
-rw-r--r--TAO/tests/POA/Explicit_Activation/alternate.conf.xml2
-rw-r--r--TAO/tests/POA/FindPOA/Adapter_Activator.h2
-rw-r--r--TAO/tests/POA/Identity/svc.conf.xml2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/svc.conf.xml2
-rw-r--r--TAO/tests/Param_Test/svc.conf.xml2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3079/test_i.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3080/test_i.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_3582/test_i.h2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/test_i.h2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Collocation/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Collocation/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/svc.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/svc.conf.xml2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/svc.conf.xml2
-rw-r--r--TAO/tests/Strategies/advanced_svc.conf.xml2
-rw-r--r--TAO/tests/Strategies/simple_test.idl2
-rw-r--r--TAO/tests/Strategies/svc.conf.xml2
-rw-r--r--TAO/tests/Time_Policy/hr_time.conf.xml2
-rw-r--r--TAO/tests/Time_Policy_Custom/custom_time.conf.xml2
-rw-r--r--TAO/utils/nsgroup/windows.conf.xml2
596 files changed, 602 insertions, 605 deletions
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
index 4d01096a265..64b16d70739 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.cpp
@@ -1,5 +1,5 @@
#include "amh_pch.h"
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
index 96599fba814..58fa8170f74 100644
--- a/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/AMH_Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.cpp b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
index 8e8b46f9fd6..ff63085ba51 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.cpp
@@ -1,5 +1,5 @@
#include "amh_pch.h"
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH/Messenger_i.h b/TAO/DevGuideExamples/AMH/Messenger_i.h
index ac46da0603c..440732375dd 100644
--- a/TAO/DevGuideExamples/AMH/Messenger_i.h
+++ b/TAO/DevGuideExamples/AMH/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp
index 83b1858a1b4..5ac86f746f2 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "amh_ami_pch.h"
#include "inner_i.h"
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_i.h b/TAO/DevGuideExamples/AMH_AMI/inner_i.h
index b37b2402a5c..a3ba1def9aa 100644
--- a/TAO/DevGuideExamples/AMH_AMI/inner_i.h
+++ b/TAO/DevGuideExamples/AMH_AMI/inner_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_i.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_i.cpp
index 7c965aaa4ab..d73572dff9a 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle_i.cpp
+++ b/TAO/DevGuideExamples/AMH_AMI/middle_i.cpp
@@ -1,5 +1,5 @@
#include "amh_ami_pch.h"
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_i.h b/TAO/DevGuideExamples/AMH_AMI/middle_i.h
index 4ad565afb6b..dae7c6f448a 100644
--- a/TAO/DevGuideExamples/AMH_AMI/middle_i.h
+++ b/TAO/DevGuideExamples/AMH_AMI/middle_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MIDDLE_I_H_
#define MIDDLE_I_H_
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
index b571e5293b1..a5a5752bec4 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.cpp
@@ -1,5 +1,5 @@
#include "started_pch.h"
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
index c54aea73606..c5e1efee908 100644
--- a/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
+++ b/TAO/DevGuideExamples/GettingStarted/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
index ea81ece9078..7fd597c9f45 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
index e194be73ab8..86c1412ebff 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
index c46313ce85f..bd8302bd79e 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
index a3db1df9bcf..d49d63761c2 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
index b571e5293b1..a5a5752bec4 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.cpp
@@ -1,5 +1,5 @@
#include "started_pch.h"
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
index c54aea73606..c5e1efee908 100644
--- a/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/DynamicThreadPool/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
index bd769b65ce7..5b42492bc30 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERSERVER_H_
#define MESSENGERSERVER_H_
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
index 2672ea53671..a3abf805916 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "MessengerShutdownTimer.h"
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h
index ae0cb97e37d..2d67eb70eef 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerShutdownTimer.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERSHUTDOWNTIMER_H_
#define MESSENGERSHUTDOWNTIMER_H_
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index 1679e90c064..6a002f1adbe 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index 59ff3c893ce..eca9e343812 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index 835534954f5..fd6851b32b2 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index a3db1df9bcf..d49d63761c2 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index 9f32027c1fe..b43707e7210 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index a3db1df9bcf..d49d63761c2 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index 9f32027c1fe..b43707e7210 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index a3db1df9bcf..d49d63761c2 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
index 564a16a15f8..ce9097d59b7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
index a5d46040aca..f4467924f58 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
index 2922a0235ac..eb6e11477fe 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
index 4b083b3c60a..68e056019b7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/RTCORBA/Messenger_i.h b/TAO/DevGuideExamples/RTCORBA/Messenger_i.h
index 35a02266c58..ab6d73d37e1 100644
--- a/TAO/DevGuideExamples/RTCORBA/Messenger_i.h
+++ b/TAO/DevGuideExamples/RTCORBA/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
index d5549a2dfda..32349ed7f16 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
index 7931673b26c..e2cd0fc8925 100644
--- a/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
+++ b/TAO/DevGuideExamples/SmartProxies/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 3cb327d1a79..0f34bb522a1 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id$ -->
+<!-- -->
<HTML>
<HEAD>
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 4cffcd1c5df..97a2f4588f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -2,7 +2,7 @@
/**
* @file be_visitor_arg_traits.cpp
*
-* $Id$
+*
*
* This visitor generates template specializations for argument traits classes.
*
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index afd516f0c2c..32354c408b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -2,7 +2,7 @@
/**
* @file array_ch.cpp
*
- * $Id$
+ *
*
* Visitor for Array code generation in client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index feb47d08c00..1abb1748779 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_ch.cpp
*
-* $Id$
+*
*
* Specialized interface visitor for AMH-RH generates code that is
* specific to AMH interfaces.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
index 79c2a167a42..c9c794c602a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_rh_sh.cpp
*
-* $Id$
+*
*
* Specialized interface visitor for AMH-RH that generates code
* for RH interfaces in skeleton source files
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index b8ced1fbe33..cda9ffc6f86 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_rh_ss.cpp
*
-* $Id$
+*
*
* Specialized interface visitor for AMH-ResponseHandler that generates code for
* RH in the skeleton source files.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 75f65b6be9d..fb3eaa86b84 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_sh.cpp
*
-* $Id$
+*
*
* Specialized interface visitor for AMH generates code that is
* specific to AMH interfaces.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index 23e03b91b3e..fc16e521e03 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_ss.cpp
*
-* $Id$
+*
*
* Specialized interface visitor for AMH.
*
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index aa7b66b32ca..2554b42af72 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -2,7 +2,7 @@
/**
* @file amh_ss.cpp
*
-* $Id$
+*
*
* Creates code for AMH operations.
*
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
index f0f9229c053..c6c740b20c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
@@ -2,7 +2,7 @@
/**
* @file be_visitor_template_export.cpp
*
-* $Id$
+*
*
* This visitor generates template instantiations with export macro
*
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index cb2616c223c..c4ebf146cfa 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -2,7 +2,7 @@
/**
* @file be_visitor_traits.cpp
*
-* $Id$
+*
*
* This visitor generates template specializations for traits of various
* kinds for IDL declarations. These specialized template classes are then
diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
index 50c0b4ec8b7..fb62a9b863e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h
@@ -2,7 +2,7 @@
/**
* @file be_visitor_amh_pre_proc.h
*
-* $Id$
+*
*
* This visitor creates for AMH implied IDL constructs for the ResponseHandler,
* the appropriate AST
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 8d88b3281bd..dfc5f74cf2b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -2,7 +2,7 @@
/**
* @file be_visitor_arg_traits.h
*
-* $Id$
+*
*
* This visitor generates template specializations for argument traits classes.
*
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
index 09c44875df7..a898fe5e344 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h
@@ -2,7 +2,7 @@
/**
* @file amh_rh_sh.h
*
-* $Id$
+*
*
* Creates operation code for AMH-RH operations.
*
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
index 9d3d1c566c6..839fb727de4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h
@@ -2,7 +2,7 @@
/**
* @file amh_rh_ss.h
*
-* $Id$
+*
*
* Creates code for AMH-RH operations.
*
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
index 15368d492e3..01d13e30916 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h
@@ -2,7 +2,7 @@
/**
* @file amh_sh.h
*
-* $Id$
+*
*
* Creates code for AMH operations.
*
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
index ee9855c6fbd..a23965af079 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h
@@ -2,7 +2,7 @@
/**
* @file amh_ss.h
*
-* $Id$
+*
*
* Creates code for AMH operations.
*
diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h
index ccd134056ae..00a1bf4b573 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h
@@ -2,7 +2,7 @@
/**
* @file be_visitor_traits.h
*
-* $Id$
+*
*
* This visitor generates template specializations for traits of various
* kinds for IDL declarations. These specialized template classes are then
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index eedebbf59f8..bb12e25880d 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -1,4 +1,4 @@
-// $Id$
+//
#include "fe_private.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index dc33d46d30f..4fca97ac1ee 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -929,7 +929,7 @@ int tao_yy_flex_debug = 0;
char tao_yytext[TAO_YYLMAX];
char *tao_yytext_ptr;
-/* $Id$
+/*
COPYRIGHT
diff --git a/TAO/bin/rm_exception_macros.pl b/TAO/bin/rm_exception_macros.pl
index e9ae6b2d82e..397f2f738a9 100755
--- a/TAO/bin/rm_exception_macros.pl
+++ b/TAO/bin/rm_exception_macros.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
# ******************************************************************
# Author: Chad Elliott
# Date: 1/24/2007
-# $Id$
+#
# Description: This script attempts to remove the ACE related exception
# macros from source code provided on the comand line. It
# is not perfect, but does handle a large number of cases.
diff --git a/TAO/docs/INS.html b/TAO/docs/INS.html
index f02a55c860e..f9c4eae170c 100644
--- a/TAO/docs/INS.html
+++ b/TAO/docs/INS.html
@@ -1,4 +1,4 @@
- <!-- $Id$ -->
+ <!-- -->
<HTML>
<HEAD>
diff --git a/TAO/docs/LocalObject.html b/TAO/docs/LocalObject.html
index f2cb0adc548..4038dfd9a91 100644
--- a/TAO/docs/LocalObject.html
+++ b/TAO/docs/LocalObject.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<!-- $Id$ -->
+<!-- -->
<html> <head>
<title>Implementing and Using Local Objects</title>
</head>
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 0c5614d7457..7dcbe5afb01 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<!-- $Id$ -->
+<!-- -->
<html>
<head>
diff --git a/TAO/docs/ORB_Internals.html b/TAO/docs/ORB_Internals.html
index 05ffb00c2a4..2535e1e3314 100644
--- a/TAO/docs/ORB_Internals.html
+++ b/TAO/docs/ORB_Internals.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
- <!-- $Id$ -->
+ <!-- -->
<title>TAO ORB Internals</title>
</head>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 91c0108167b..88f1d914e10 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
-<!-- $Id$ -->
+<!-- -->
<title>Options for TAO Components</title>
</head>
<body bgcolor="#ffffff" link="#000fff" vlink="#ff0f0f" text="#000000">
diff --git a/TAO/docs/Security/Conformance.html b/TAO/docs/Security/Conformance.html
index 076be0af6cb..7f3ac64c8f2 100644
--- a/TAO/docs/Security/Conformance.html
+++ b/TAO/docs/Security/Conformance.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/Download.html b/TAO/docs/Security/Download.html
index dc99f14946b..7f8d06b475c 100644
--- a/TAO/docs/Security/Download.html
+++ b/TAO/docs/Security/Download.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/FAQ.html b/TAO/docs/Security/FAQ.html
index 3d1e221fb51..c2c825f8a17 100644
--- a/TAO/docs/Security/FAQ.html
+++ b/TAO/docs/Security/FAQ.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/SSLIOP-INSTALL.html b/TAO/docs/Security/SSLIOP-INSTALL.html
index b2e5dae3dd4..6df823be2a4 100644
--- a/TAO/docs/Security/SSLIOP-INSTALL.html
+++ b/TAO/docs/Security/SSLIOP-INSTALL.html
@@ -3,7 +3,7 @@
<head>
<title>TAO's SSLIOP Protocol - Installation</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/Security/SSLIOP-USAGE.html b/TAO/docs/Security/SSLIOP-USAGE.html
index f8bcaf45f6f..8db70f6cd6b 100644
--- a/TAO/docs/Security/SSLIOP-USAGE.html
+++ b/TAO/docs/Security/SSLIOP-USAGE.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/SSLIOP.html b/TAO/docs/Security/SSLIOP.html
index 58486d4145c..634ea0afc65 100644
--- a/TAO/docs/Security/SSLIOP.html
+++ b/TAO/docs/Security/SSLIOP.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/Security_Service.html b/TAO/docs/Security/Security_Service.html
index a0850b4cc22..0ebbe1d563c 100644
--- a/TAO/docs/Security/Security_Service.html
+++ b/TAO/docs/Security/Security_Service.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
`<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Security/fireworks/nav_bar.html b/TAO/docs/Security/fireworks/nav_bar.html
index 63b1cfdd3cd..4c38139ec7e 100644
--- a/TAO/docs/Security/fireworks/nav_bar.html
+++ b/TAO/docs/Security/fireworks/nav_bar.html
@@ -3,7 +3,7 @@
<!--and paste the table in a different location.-->
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<title>nav_bar.gif</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/Security/index.html b/TAO/docs/Security/index.html
index 3cb45c6a353..ffde4b8fa30 100644
--- a/TAO/docs/Security/index.html
+++ b/TAO/docs/Security/index.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<!-- #BeginTemplate "/Templates/TAO_Security.dwt" -->
<head>
<!-- #BeginEditable "doctitle" -->
diff --git a/TAO/docs/Smart_Proxies.html b/TAO/docs/Smart_Proxies.html
index c29a03ac88f..94295f9babf 100644
--- a/TAO/docs/Smart_Proxies.html
+++ b/TAO/docs/Smart_Proxies.html
@@ -1,4 +1,4 @@
-<!-- $Id$-->
+<!-- -->
<HTML>
<TITLE>Smart Proxies</TITLE>
<BODY>
diff --git a/TAO/docs/TAO-metrics.html b/TAO/docs/TAO-metrics.html
index 01726837d54..857f888e642 100644
--- a/TAO/docs/TAO-metrics.html
+++ b/TAO/docs/TAO-metrics.html
@@ -1,4 +1,4 @@
-<!-- $Id$-->
+<!-- -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<TITLE>TAO-metrics</TITLE>
diff --git a/TAO/docs/TAO-tutorials.html b/TAO/docs/TAO-tutorials.html
index 5d634b1676e..6d670c673e9 100644
--- a/TAO/docs/TAO-tutorials.html
+++ b/TAO/docs/TAO-tutorials.html
@@ -1,4 +1,4 @@
- <!-- $Id$ -->
+ <!-- -->
<html> <head>
<title><HTML>
<TITLE>CORBA and TAO Beginners' Guide</TITLE>
diff --git a/TAO/docs/Tags.html b/TAO/docs/Tags.html
index f366600da61..0fd16dac020 100644
--- a/TAO/docs/Tags.html
+++ b/TAO/docs/Tags.html
@@ -1,6 +1,6 @@
<HTML>
<HEAD>
- <!-- $Id$ -->
+ <!-- -->
<TITLE>Tags used in TAO</TITLE>
</HEAD>
diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html
index a1109db123d..e91ac919a4e 100644
--- a/TAO/docs/cec_options.html
+++ b/TAO/docs/cec_options.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>COS Event Channel Configuration</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index cc1420c5847..f09fb39b97a 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -5,7 +5,7 @@
<meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
<title>TAO IDL compiler User's Guide</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#CC0000">
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index 09f46cd2dcc..fb6ba7790e1 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -1,5 +1,5 @@
<HTML>
-<!-- $Id$ -->
+<!-- -->
<HEAD>
<META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
<TITLE>TAO Component Options and Tuning Documentation</TITLE>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index 3afdb17ad9b..5f02fbbb689 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
diff --git a/TAO/docs/documentation.html b/TAO/docs/documentation.html
index dd1433f43cb..ee5ce3a8513 100644
--- a/TAO/docs/documentation.html
+++ b/TAO/docs/documentation.html
@@ -1,5 +1,5 @@
<HTML>
-<!-- $Id$ -->
+<!-- -->
<HEAD>
<META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
<TITLE>TAO Programmer's Guides</TITLE>
diff --git a/TAO/docs/dynany/index.html b/TAO/docs/dynany/index.html
index cbad7958f04..a540a15f3c4 100644
--- a/TAO/docs/dynany/index.html
+++ b/TAO/docs/dynany/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Dynamic Any Status</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body text="#000000" bgcolor="#FFFFFF">
diff --git a/TAO/docs/ec_options.html b/TAO/docs/ec_options.html
index efceece9965..fbdfc703813 100644
--- a/TAO/docs/ec_options.html
+++ b/TAO/docs/ec_options.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Real-Time Event Channel Configuration</title>
- <!-- $Id$-->
+ <!-- -->
</head>
<body>
diff --git a/TAO/docs/es_configs.html b/TAO/docs/es_configs.html
index 79e891026fe..c9522a74856 100644
--- a/TAO/docs/es_configs.html
+++ b/TAO/docs/es_configs.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html
index a631d4503ab..099bf1bd3ef 100644
--- a/TAO/docs/events_tutorial.html
+++ b/TAO/docs/events_tutorial.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<title>Using the Real-Time Event Service</title>
</head>
diff --git a/TAO/docs/exceptions.html b/TAO/docs/exceptions.html
index f847bd780ef..afa5e275f99 100644
--- a/TAO/docs/exceptions.html
+++ b/TAO/docs/exceptions.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML SYSTEM
"http://www.w3.org/pub/WWW/MarkUp/Cougar/Cougar.dtd">
-<!-- $Id$ -->
+<!-- -->
<html> <head>
<title>Exception handling</title>
</head>
diff --git a/TAO/docs/forwarding.html b/TAO/docs/forwarding.html
index 82301a47905..8f9093dff3d 100644
--- a/TAO/docs/forwarding.html
+++ b/TAO/docs/forwarding.html
@@ -1,5 +1,5 @@
<html>
- <!-- $Id$ -->
+ <!-- -->
<head>
<title>Implementation of location forwarding</title>
</head>
diff --git a/TAO/docs/implrepo/index.html b/TAO/docs/implrepo/index.html
index 34d0e34c492..87a0f2358b7 100644
--- a/TAO/docs/implrepo/index.html
+++ b/TAO/docs/implrepo/index.html
@@ -5,7 +5,7 @@
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>Implementation Repository</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body bgcolor="#FFFFFF" text="#000000">
diff --git a/TAO/docs/implrepo/paper.html b/TAO/docs/implrepo/paper.html
index e22ac0e73f5..9324edda5ab 100644
--- a/TAO/docs/implrepo/paper.html
+++ b/TAO/docs/implrepo/paper.html
@@ -5,7 +5,7 @@
content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
<title>TAO Implementation Repository</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
diff --git a/TAO/docs/implrepo/tao_imr.html b/TAO/docs/implrepo/tao_imr.html
index 3e4160b4675..2b0d6bc41a9 100644
--- a/TAO/docs/implrepo/tao_imr.html
+++ b/TAO/docs/implrepo/tao_imr.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/implrepo/usersguide.html b/TAO/docs/implrepo/usersguide.html
index d268e7860b9..ca40cafd841 100644
--- a/TAO/docs/implrepo/usersguide.html
+++ b/TAO/docs/implrepo/usersguide.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 9355ebec24b..b67a273a2a8 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -2,7 +2,7 @@
<head>
-<!-- $Id$ -->
+<!-- -->
<meta NAME="GENERATOR" CONTENT="Microsoft FrontPage 4.0">
<title>TAO Documentation</title>
diff --git a/TAO/docs/interceptors.html b/TAO/docs/interceptors.html
index 318f2023315..f7dc262c4aa 100644
--- a/TAO/docs/interceptors.html
+++ b/TAO/docs/interceptors.html
@@ -90,7 +90,7 @@ Portable Interceptor interfaces. Below is the old but now obsolete
interceptor version in TAO.</p>
<pre>
-// -*- IDL -*- $Id$
+// -*- IDL -*-
// This file contains the interface definitions for "Portable"
// Interceptor support.
diff --git a/TAO/docs/interfacerepo/index.html b/TAO/docs/interfacerepo/index.html
index ef7e6623308..8ad637280d0 100644
--- a/TAO/docs/interfacerepo/index.html
+++ b/TAO/docs/interfacerepo/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Dynamic Any Status</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body text="#000000" bgcolor="#FFFFFF">
diff --git a/TAO/docs/interfacerepo/tao_ifr.html b/TAO/docs/interfacerepo/tao_ifr.html
index b9a3ff740f2..1818a24d7c4 100644
--- a/TAO/docs/interfacerepo/tao_ifr.html
+++ b/TAO/docs/interfacerepo/tao_ifr.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
<title>tao_ifr User's Guide</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#CC0000">
diff --git a/TAO/docs/ior_parsing.html b/TAO/docs/ior_parsing.html
index a1741883e06..ad9250f59b7 100644
--- a/TAO/docs/ior_parsing.html
+++ b/TAO/docs/ior_parsing.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
- <!-- $Id$ -->
+ <!-- -->
<title>Adding new IOR Parsers to TAO</title>
</head>
diff --git a/TAO/docs/leader_follower.html b/TAO/docs/leader_follower.html
index 01af5fff1eb..a5cddb813bd 100644
--- a/TAO/docs/leader_follower.html
+++ b/TAO/docs/leader_follower.html
@@ -1,5 +1,5 @@
<html>
- <!-- $Id$ -->
+ <!-- -->
<head>
<title>Implementation of leader follower model for global resources</title>
</head>
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index 49c064acce1..d2fcce045df 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<HTML>
<HEAD>
diff --git a/TAO/docs/locate_request.html b/TAO/docs/locate_request.html
index 5c04d652874..cc79b81dc9b 100644
--- a/TAO/docs/locate_request.html
+++ b/TAO/docs/locate_request.html
@@ -1,5 +1,5 @@
<html>
- <!-- $Id$ -->
+ <!-- -->
<head>
<title>Implementation of locate requests</title>
</head>
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
index 6f3d0e24d50..72391ffd8ed 100644
--- a/TAO/docs/minimumTAO.html
+++ b/TAO/docs/minimumTAO.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<html>
<head>
diff --git a/TAO/docs/notification/monitor.html b/TAO/docs/notification/monitor.html
index d2e84391ff8..2fcfb390a51 100644
--- a/TAO/docs/notification/monitor.html
+++ b/TAO/docs/notification/monitor.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Notification Service Monitor</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<h2>Description</h2>
<p>
diff --git a/TAO/docs/notification/reliability.html b/TAO/docs/notification/reliability.html
index cc04b3c07c7..2afc6272015 100644
--- a/TAO/docs/notification/reliability.html
+++ b/TAO/docs/notification/reliability.html
@@ -4,7 +4,7 @@
<title>Using the Reliable Notification Service</title>
<meta content="False" name="vs_snapToGrid">
<meta content="False" name="vs_showGrid">
- <!-- $Id$ -->
+ <!-- -->
</head>
<body>
<h1>Using the Reliable Notification Service</h1>
diff --git a/TAO/docs/notification/using_monitor_extensions.html b/TAO/docs/notification/using_monitor_extensions.html
index 324fb63cc08..5e16061ce48 100644
--- a/TAO/docs/notification/using_monitor_extensions.html
+++ b/TAO/docs/notification/using_monitor_extensions.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Using the CosNotification Monitoring Extensions</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body>
<h2>Using the NotifyMonitoringExt::EventChannelFactory.</h2>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index ddb68173bc9..b4d2f0c1aa8 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -1,5 +1,5 @@
<html>
- <!-- $Id$ -->
+ <!-- -->
<head>
<title>TAO's CORBA Object Services Documentation</title>
</head>
diff --git a/TAO/docs/performance.html b/TAO/docs/performance.html
index 133649ad5dd..39e569365cf 100644
--- a/TAO/docs/performance.html
+++ b/TAO/docs/performance.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <!-- $Id$ -->
+ <!-- -->
<title>TAO Performance and Footprint Tuning</title>
<LINK href="tao.css" rel="stylesheet" type="text/css">
</head>
diff --git a/TAO/docs/pluggable_messaging.html b/TAO/docs/pluggable_messaging.html
index dd3d37b184a..4db9d3edbde 100644
--- a/TAO/docs/pluggable_messaging.html
+++ b/TAO/docs/pluggable_messaging.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML SYSTEM
"http://www.w3.org/pub/WWW/MarkUp/Cougar/Cougar.dtd">
- <!-- $Id$-->
+ <!-- -->
<head>
<title>Pluggable Messaging framework</title>
</head>
diff --git a/TAO/docs/pluggable_protocols/index.html b/TAO/docs/pluggable_protocols/index.html
index 7c7315c2784..88817c7b5ab 100644
--- a/TAO/docs/pluggable_protocols/index.html
+++ b/TAO/docs/pluggable_protocols/index.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id$ -->
+<!-- -->
<HTML>
<HEAD>
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index 7cb99ccd7e3..995924bc525 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -2,7 +2,7 @@
<HEAD>
<META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
<TITLE>Migrating from the BOA to the POA</TITLE>
- <!-- $Id$ -->
+ <!-- -->
</HEAD>
<BODY text = "#000000"
diff --git a/TAO/docs/reactivator.html b/TAO/docs/reactivator.html
index 43e853d572e..28040af4b49 100644
--- a/TAO/docs/reactivator.html
+++ b/TAO/docs/reactivator.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<title> TAO Reactivation Service </title>
diff --git a/TAO/docs/releasenotes.html b/TAO/docs/releasenotes.html
index 03f1b5b2c73..0003327824a 100644
--- a/TAO/docs/releasenotes.html
+++ b/TAO/docs/releasenotes.html
@@ -6,7 +6,7 @@
<TITLE>TAO Release Information and TODO List</TITLE>
</HEAD>
<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#000FFF" VLINK="#FF0F0F">
-<!-- $Id$ -->
+<!-- -->
<CENTER>
<H2>
Release Information for The ACE ORB (TAO)</H2></CENTER>
diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html
index 6320b983ab1..8e2fc200afe 100644
--- a/TAO/docs/releasenotes/OBV.html
+++ b/TAO/docs/releasenotes/OBV.html
@@ -4,7 +4,7 @@
<head>
<title>Object-by-Value status</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body>
diff --git a/TAO/docs/releasenotes/PSS.html b/TAO/docs/releasenotes/PSS.html
index 3f44535a1b4..6b021fe8e06 100644
--- a/TAO/docs/releasenotes/PSS.html
+++ b/TAO/docs/releasenotes/PSS.html
@@ -4,7 +4,7 @@
<head>
<title>Persistent State Service status</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body>
diff --git a/TAO/docs/releasenotes/RTCorba.html b/TAO/docs/releasenotes/RTCorba.html
index 0607c76936e..3b60439dfa7 100644
--- a/TAO/docs/releasenotes/RTCorba.html
+++ b/TAO/docs/releasenotes/RTCorba.html
@@ -6,7 +6,7 @@
</head>
<body>
-<!-- $Id$ -->
+<!-- -->
<h1 align="center">Real-Time CORBA</h1>
<p align="center"><i>Last Update October 4, 2000</i></p>
<p align="left">This documents keeps track of the TAO's <a href="#RT Corba Development Status">Real-Time CORBA Development Status</a> , and a description of the <a href="#Release Notes">Release
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index 317cb064820..3d66d9c341c 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -3,7 +3,7 @@
<TITLE>TAO TO-DO List</TITLE>
</HEAD>
<BODY TEXT="#000000" BGCOLOR="#FFFFFF">
- <!-- $Id$ -->
+ <!-- -->
<CENTER><HR></CENTER>
<CENTER>
diff --git a/TAO/docs/releasenotes/amh.html b/TAO/docs/releasenotes/amh.html
index 6d6084a438e..141d1a4eabe 100644
--- a/TAO/docs/releasenotes/amh.html
+++ b/TAO/docs/releasenotes/amh.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>AMH Status</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body bgcolor="#FFFFFF" text="#000000">
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index a87016dee38..c7a6a685f6d 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -2,7 +2,7 @@
<HTML>
<HEAD>
<TITLE>Event Service Status</TITLE>
- <!-- $Id$ -->
+ <!-- -->
</HEAD>
<BODY TEXT="#000000" BGCOLOR="#FFFFFF">
diff --git a/TAO/docs/releasenotes/ftcorba_services.html b/TAO/docs/releasenotes/ftcorba_services.html
index d06573c6a4b..f4854e1bfd5 100755
--- a/TAO/docs/releasenotes/ftcorba_services.html
+++ b/TAO/docs/releasenotes/ftcorba_services.html
@@ -1,5 +1,5 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!-- $Id$ -->
+<!-- -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/releasenotes/ftrt_ec.html b/TAO/docs/releasenotes/ftrt_ec.html
index 358350d2dcf..c0c705b633e 100644
--- a/TAO/docs/releasenotes/ftrt_ec.html
+++ b/TAO/docs/releasenotes/ftrt_ec.html
@@ -1,5 +1,5 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!-- $Id$ -->
+<!-- -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index a529f697ec9..6fcfb66e803 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -6,7 +6,7 @@
<title>TAO Release Information and TODO List</title>
</head>
<body text="#000000" bgcolor="#FFFFFF">
-<!-- $Id$ -->
+<!-- -->
<center>
<hr></center>
diff --git a/TAO/docs/releasenotes/notify.html b/TAO/docs/releasenotes/notify.html
index b03a3cd5765..6a607ac992a 100644
--- a/TAO/docs/releasenotes/notify.html
+++ b/TAO/docs/releasenotes/notify.html
@@ -1,6 +1,6 @@
<HTML>
<BODY text="#000000" bgcolor="#FFFFFF">
-<!-- $Id$ -->
+<!-- -->
<title>TAO's Notification Service</title>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index 8a4ed62cc67..1e4a11f1d4f 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>ORB Core Status</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body text="#000000" bgcolor="#FFFFFF">
diff --git a/TAO/docs/releasenotes/rtc10_sched.html b/TAO/docs/releasenotes/rtc10_sched.html
index 526290b7a8f..2e51ce7c8f5 100644
--- a/TAO/docs/releasenotes/rtc10_sched.html
+++ b/TAO/docs/releasenotes/rtc10_sched.html
@@ -1,5 +1,5 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!-- $Id$ -->
+<!-- -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
index 0d392bafffb..0f011450388 100644
--- a/TAO/docs/releasenotes/trader.html
+++ b/TAO/docs/releasenotes/trader.html
@@ -6,7 +6,7 @@
</head>
<body text="#000000" link="#0000FF" vlink="#CC0000" bgcolor="#FFFFFF">
- <!-- $Id$ -->
+ <!-- -->
<hr>
<h1 align="center">TAO Trading Service Documentation</h1>
diff --git a/TAO/docs/rtcorba/architecture.html b/TAO/docs/rtcorba/architecture.html
index b06460a079d..a88c762f940 100644
--- a/TAO/docs/rtcorba/architecture.html
+++ b/TAO/docs/rtcorba/architecture.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>TAO Real-Time Architecture</title>
diff --git a/TAO/docs/rtcorba/content.html b/TAO/docs/rtcorba/content.html
index 0e0f6b68f89..1f5a7a9880f 100644
--- a/TAO/docs/rtcorba/content.html
+++ b/TAO/docs/rtcorba/content.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>TAO Real-Time CORBA Documentation Table of Content</title>
diff --git a/TAO/docs/rtcorba/faq.html b/TAO/docs/rtcorba/faq.html
index ab446b2620b..ac0ec52cfb4 100644
--- a/TAO/docs/rtcorba/faq.html
+++ b/TAO/docs/rtcorba/faq.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>TAO Real-Time CORBA Frequently Asked Questions</title>
diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html
index 4c217d136ea..a8d1edc5d3b 100644
--- a/TAO/docs/rtcorba/features.html
+++ b/TAO/docs/rtcorba/features.html
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Mozilla/4.77 [en] (Windows NT 5.0; U) [Netscape]">
<title>TAO Real-Time CORBA Features Documentation</title>
-<!-- $Id$ -->
+<!-- -->
</head>
<body>
diff --git a/TAO/docs/rtcorba/index.html b/TAO/docs/rtcorba/index.html
index 994b5dd6398..4c5b2bfce30 100644
--- a/TAO/docs/rtcorba/index.html
+++ b/TAO/docs/rtcorba/index.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
diff --git a/TAO/docs/rtcorba/issues.html b/TAO/docs/rtcorba/issues.html
index 43c3e1979b0..ffa62699eae 100644
--- a/TAO/docs/rtcorba/issues.html
+++ b/TAO/docs/rtcorba/issues.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Implementation Issues and Known Bugs</title>
diff --git a/TAO/docs/rtcorba/omg_issues.html b/TAO/docs/rtcorba/omg_issues.html
index bb49722b205..33316e69210 100644
--- a/TAO/docs/rtcorba/omg_issues.html
+++ b/TAO/docs/rtcorba/omg_issues.html
@@ -1,6 +1,6 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Issues with OMG Real-Time CORBA 1.0 Specification</title>
diff --git a/TAO/docs/rtcorba/status.html b/TAO/docs/rtcorba/status.html
index e24248985c7..f77968eb588 100644
--- a/TAO/docs/rtcorba/status.html
+++ b/TAO/docs/rtcorba/status.html
@@ -1,5 +1,5 @@
<html>
-<!-- $Id$ -->
+<!-- -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/docs/transport_current/index.html b/TAO/docs/transport_current/index.html
index c4b308c5121..c2e484d7e5f 100644
--- a/TAO/docs/transport_current/index.html
+++ b/TAO/docs/transport_current/index.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id$ -->
+<!-- -->
<HTML>
<HEAD>
diff --git a/TAO/docs/tutorials/Quoter/AMI/index.html b/TAO/docs/tutorials/Quoter/AMI/index.html
index db110debade..4cf10eba649 100644
--- a/TAO/docs/tutorials/Quoter/AMI/index.html
+++ b/TAO/docs/tutorials/Quoter/AMI/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Asynchronous Method Invocation - CORBA for impatient clients</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml b/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml
index b8377b00cda..abee5092d1b 100644
--- a/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml
+++ b/TAO/docs/tutorials/Quoter/AMI/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./docs/tutorials/Quoter/AMI/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/>
</ACE_Svc_Conf>
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml b/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml
index f6fed99198b..8d1c03c91a5 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml
+++ b/TAO/docs/tutorials/Quoter/Event_Service/ec.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./docs/tutorials/Quoter/Event_Service/ec.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- static EC_Factory "-ECfiltering null" -->
<!-- -ECproxyconsumerlock thread " #-ECproxysupplierlock thread" # -ECsupplierfiltering per-supplier" -->
</ACE_Svc_Conf>
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/index.html b/TAO/docs/tutorials/Quoter/Event_Service/index.html
index 8124b44a3e5..1d5b58407e7 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/index.html
+++ b/TAO/docs/tutorials/Quoter/Event_Service/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>TAO's COS Event Service</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/index.html b/TAO/docs/tutorials/Quoter/Naming_Service/index.html
index 4c4b09b62db..8e27fbb6b01 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/index.html
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>TAO's Naming Service</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
index 66fd2b0567d..ca6ca903078 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
@@ -3,7 +3,7 @@
<html>
<head>
<title>Servant Managers</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl
index 2620d6901ea..d533033154e 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl
@@ -3,7 +3,7 @@
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
* @author William R. Otte <wotte@dre.vanderbilt.edu>
* @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
- * $Id$
+ *
* Contains IDL definitions for the Stock Broker in the Publish/Subscribe Real-time CORBA
* Stock Quoter Service.
*/
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl
index 9db8b4dcf1d..d699a777de1 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl
@@ -4,7 +4,7 @@
* @author William R. Otte <wotte@dre.vanderbilt.edu>
* @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
- * $Id$
+ *
* Contains common IDL definitions in the Publish/Subscribe Real-time CORBA
* Stock Quoter Service.
*/
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl
index 347a7470331..29893b8f734 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl
@@ -4,7 +4,7 @@
* @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
* @author William R. Otte <wotte@dre.vanderbilt.edu>
* @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
- * $Id$
+ *
* Contains IDL definitions for the Distributor in the Publish/Subscribe Real-time CORBA
* Stock Quoter Service.
*/
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html
index 774a3892c5b..e9d7f5fa2ae 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/database.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/database.html
index 07ff35a8cf3..bd1aab797bf 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/database.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/database.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
index c0752c44f1a..92987743fa8 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/distributor.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
index fa317ce3acf..39393afd5f4 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/idl.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/index.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/index.html
index 444b8e8aa74..31a24d626b6 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/index.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/index.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/mpc.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/mpc.html
index 15e6b513df1..d4ea45b3648 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/mpc.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/mpc.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html
index 95d20b23aed..9b4f2f97525 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/nameConsumer.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
index e0412905b56..69b66598703 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/prioritymapping.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/run.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/run.html
index 2006748137c..3c8a9bc267e 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/run.html
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/run.html
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html b/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
index 20046fb66c9..081b392b41e 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>TAO's RT Event Service</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/index.html b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
index 7ec67d00260..4cf2e8579f2 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Introduction - A very simple client</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
index 0680b71599a..8c61dee7cc1 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Implementation Repository</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<body text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
index b3c0eabff12..6123dbc5252 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Introduction - Improving the Server</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
index e0a65775921..fb4b144fe7a 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Persistent Objects</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/index.html b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
index aeb82f41581..7683663d589 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Introduction - A very simple server</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html
index 26c6fc4b8ca..2de4e419112 100644
--- a/TAO/docs/tutorials/Quoter/index.html
+++ b/TAO/docs/tutorials/Quoter/index.html
@@ -3,7 +3,7 @@
<head>
<title>Building a Stock Quoter with TAO - A Tutorial</title>
- <!-- $Id$ -->
+ <!-- -->
</head>
<BODY text = "#000000"
diff --git a/TAO/examples/AMH/Sink_Server/st_server.conf.xml b/TAO/examples/AMH/Sink_Server/st_server.conf.xml
index 981d619d165..6a9832db41f 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.conf.xml
+++ b/TAO/examples/AMH/Sink_Server/st_server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./examples/AMH/Sink_Server/st_server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- We want an optimised single threaded Reactive server -->
<!-- -->
diff --git a/TAO/examples/AMI/FL_Callback/peer.conf.xml b/TAO/examples/AMI/FL_Callback/peer.conf.xml
index b4e94893014..bb4d8c3cf69 100644
--- a/TAO/examples/AMI/FL_Callback/peer.conf.xml
+++ b/TAO/examples/AMI/FL_Callback/peer.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/AMI/FL_Callback/peer.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/>
</ACE_Svc_Conf>
diff --git a/TAO/examples/Buffered_AMI/svc.conf.xml b/TAO/examples/Buffered_AMI/svc.conf.xml
index 0e8c34a129c..ada36791292 100644
--- a/TAO/examples/Buffered_AMI/svc.conf.xml
+++ b/TAO/examples/Buffered_AMI/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/Buffered_AMI/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
index aa5446671c3..abfe34f5702 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
+++ b/TAO/examples/PluggableUDP/tests/Performance/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./examples/PluggableUDP/tests/Performance/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"/>
</ACE_Svc_Conf>
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml b/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
index 00ab337953a..2363fe27eaa 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./examples/PluggableUDP/tests/SimplePerformance/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBProtocolFactory DIOP_Factory -ORBReactorType tp"/>
</ACE_Svc_Conf>
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test.idl b/TAO/examples/PluggableUDP/tests/SimplePerformance/test.idl
index 1b4fa8e8322..e84609c514d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test.idl
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
typedef sequence<char> Char_Seq;
diff --git a/TAO/examples/Quoter/client.conf.xml b/TAO/examples/Quoter/client.conf.xml
index 3fb0800e130..ed46ef23f78 100644
--- a/TAO/examples/Quoter/client.conf.xml
+++ b/TAO/examples/Quoter/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/Quoter/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Resource_Factory" type="Service_Object">
<initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/>
diff --git a/TAO/examples/Quoter/server.conf.xml b/TAO/examples/Quoter/server.conf.xml
index 14134f9150c..1523d05ae80 100644
--- a/TAO/examples/Quoter/server.conf.xml
+++ b/TAO/examples/Quoter/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/Quoter/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Resource_Factory" type="Service_Object">
<initializer path="TAO" init="_make_TAO_Default_Resource_Factory"/>
diff --git a/TAO/examples/Simple/time-date/client.conf.xml b/TAO/examples/Simple/time-date/client.conf.xml
index 313f97e2ebf..d6d7ba1afe5 100644
--- a/TAO/examples/Simple/time-date/client.conf.xml
+++ b/TAO/examples/Simple/time-date/client.conf.xml
@@ -2,9 +2,9 @@
<!-- Converted from ./examples/Simple/time-date/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- Empty configuration file, the default configuration works just fine -->
<!-- for the client, but the svc.conf file (or -ORBSkipServiceConfigOpen) -->
<!-- breaks it. -->
diff --git a/TAO/examples/Simple/time-date/svc.conf.xml b/TAO/examples/Simple/time-date/svc.conf.xml
index 977ebe28e49..72e4b45f34d 100644
--- a/TAO/examples/Simple/time-date/svc.conf.xml
+++ b/TAO/examples/Simple/time-date/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./examples/Simple/time-date/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Define a special Reactor for single-threaded configurations. Refer -->
<!-- to README for details. -->
diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html
index 4fbebe506b9..69aac8b6f31 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html
+++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.html
@@ -1,5 +1,5 @@
<HTML>
-<!-- $Id$ -->
+<!-- -->
<HEAD>
<META NAME="DOVEBrowser" Content="DOVE Browser invokation">
<META HTTP-EQUIV="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf.xml b/TAO/examples/Simulator/Event_Supplier/svc.conf.xml
index c81d3c64822..66605c7158e 100644
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf.xml
+++ b/TAO/examples/Simulator/Event_Supplier/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/Simulator/Event_Supplier/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params=" -ORBdemuxstrategy dynamic -ORBtablesize 128"/>
</ACE_Svc_Conf>
diff --git a/TAO/interop-tests/AnyTypeCode/build.xml b/TAO/interop-tests/AnyTypeCode/build.xml
index eb3a0da302c..5decc6c3315 100644
--- a/TAO/interop-tests/AnyTypeCode/build.xml
+++ b/TAO/interop-tests/AnyTypeCode/build.xml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<project name="TAO-JacORB AnyTypeCode interop test" default="compile" basedir=".">
<property environment="env"/>
diff --git a/TAO/interop-tests/wchar/build.xml b/TAO/interop-tests/wchar/build.xml
index ee57ed6e5ec..461a25e38f8 100644
--- a/TAO/interop-tests/wchar/build.xml
+++ b/TAO/interop-tests/wchar/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- -->
-<!-- $Id$ -->
+<!-- -->
<!-- -->
<!--
diff --git a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
index 8efd955f7c3..e93ba1c6842 100644
--- a/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
+++ b/TAO/orbsvcs/Concurrency_Service/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/Concurrency_Service/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- This service must use a thread-per-connection model to enable the -->
<!-- server to block in a dedicated thread, i.e., one for each client. -->
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
index dbeedfc2666..d6e04baa4f1 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
index eb538f6470b..88d3007c575 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
index a746abca6a0..cad9543fb1c 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
index 3580f0eac6d..64dc97e2741 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/InterfaceRepo.mpc b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/InterfaceRepo.mpc
index 84c40a3a130..fd51f48d978 100644
--- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/InterfaceRepo.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/InterfaceRepo.mpc
@@ -1,4 +1,4 @@
-// $Id$
+//
project(*Browser): taoexe, portableserver, ifr_client {
exename = IFRBrowser
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
index 9a08ad2b941..51a17c26b09 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
index 3580f0eac6d..64dc97e2741 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
index 4c88ed0ab3e..5e857eefb2b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
index 3580f0eac6d..64dc97e2741 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
index 9a08ad2b941..51a17c26b09 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index 570719a887a..2c39b9ac146 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
index 30941644d6b..ed58ae335d9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index 570719a887a..2c39b9ac146 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
index 53e3f083899..4e0eb4783bf 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
index 3580f0eac6d..64dc97e2741 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
index 950529c0fa4..f5ae4c1b664 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
index 05b763622f3..5b85d67ecd4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
index c87aeb7cf4c..d4db921fbe6 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
index 91adf53963a..e0249baef77 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger.idl
index e492f3c79ab..2e6a2088552 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger.idl
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
index 23b1c035bcd..a7e2813c2d2 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "orbsvcs/SecurityC.h"
#include "MessengerC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
index d080abee9b7..9a8642a0587 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
index 6b414ea4a80..09ab0ffc100 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
index 8fc33ea4a5b..febd241327e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
index a89e037ff89..11c0981bfa1 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/ParticipatingApp.mpc
@@ -1,4 +1,4 @@
-// $Id$
+//
project(*Server): portableserver, orbsvcsexe, security, ssliop {
Source_Files {
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger.idl
index 05cf30bf5f9..2c3d7a968a5 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger.idl
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
index ed9f3f00492..c3a3b8d849d 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
index 3b5616af19e..6c0826db3e2 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
index c16cf35e730..062708bd920 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index 3ea208dd978..0a628dac14e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
index 87da7227a79..c0db56bbd23 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/PolicyControllingApp.mpc
@@ -1,4 +1,4 @@
-// $Id$
+//
project(*Server): portableserver, orbsvcsexe, security, ssliop {
Source_Files {
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger.idl
index 05cf30bf5f9..2c3d7a968a5 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger.idl
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp
index a7ac2d75343..cecfc9d96d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
index 64965cc71aa..64006306b12 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
index 69da3a8479b..ed4ef394a2f 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index 3ea208dd978..0a628dac14e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
index e514b72c58f..547efb82e7d 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/SecurityUnawareApp.mpc
@@ -1,4 +1,4 @@
-// $Id$
+//
project(*Server): taoexe, portableserver, security, ssl {
Source_Files {
diff --git a/TAO/orbsvcs/Event_Service/svc.conf.xml b/TAO/orbsvcs/Event_Service/svc.conf.xml
index 4a9c51c07f5..ae0edbf70f7 100644
--- a/TAO/orbsvcs/Event_Service/svc.conf.xml
+++ b/TAO/orbsvcs/Event_Service/svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/Event_Service/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
index 34ca3d026f0..97f409cfb87 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
@@ -4,7 +4,7 @@
/**
* @file Config_Backing_Store.h
*
-* $Id$
+*
*
* These classes define ACE_Configuration implementations of the backing store.
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index b936a7d21de..c9245e88272 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -2,7 +2,7 @@
/**
* @file Forwarder.cpp
*
-* $Id$
+*
*
* @brief Definition of ImR_DSI_Forwarder
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 0cb69b4483f..931cbb543ce 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -2,7 +2,7 @@
/**
* @file INS_Locator.cpp
*
-* $Id$
+*
*
* @brief Implementation of the ImR's INS Locator class
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index ef0495b25bd..4cf676d1648 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -3,7 +3,7 @@
/**
* @file ImR_Activator_i.h
*
-* $Id$
+*
*
* @author Priyanka Gontla <gontla_p@ociweb.com>
* @author Darrell Brunsch <brunsch@cs.wustl.edu>
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
index a77398ee72b..bca211909d0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.cpp
@@ -2,7 +2,7 @@
/**
* @file ImR_ResponseHandler.cpp
*
-* $Id$
+*
*/
//=============================================================================
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 617837e5526..498e8bb87bb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -4,7 +4,7 @@
/**
* @file Locator_Repository.h
*
-* $Id$
+*
*
* This class implements the Repository for the Implementation Repository.
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
index 54867415c1b..7de1dba18fb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
@@ -4,7 +4,7 @@
/**
* @file Shared_Backing_Store.h
*
-* $Id$
+*
*
* This class defines an implementation of the backing store as multiple XML files
* shared between multiple Locators.
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
index e9489071b96..4242464f490 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h
@@ -4,7 +4,7 @@
/**
* @file UpdateableServerInfo.h
*
-* $Id$
+*
*
*/
//=============================================================================
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
index 68b226e05bb..10e71fab866 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
@@ -4,7 +4,7 @@
/**
* @file XML_Backing_Store.h
*
-* $Id$
+*
*
* This class defines an implementation of the backing store as a single XML file.
*
diff --git a/TAO/orbsvcs/ImplRepo_Service/repository.xml b/TAO/orbsvcs/ImplRepo_Service/repository.xml
index d30518f9236..8d86b44b38e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/repository.xml
+++ b/TAO/orbsvcs/ImplRepo_Service/repository.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ImplementationRepository>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<Servers name="test" activator="MYHOST" command_line="mysrv" working_dir="mydir" activation_mode="NORMAL" start_limit="1" partial_ior="" ior="">
</Servers>
diff --git a/TAO/orbsvcs/Notify_Service/svc.conf.xml b/TAO/orbsvcs/Notify_Service/svc.conf.xml
index 32497124772..127e0b4ff85 100644
--- a/TAO/orbsvcs/Notify_Service/svc.conf.xml
+++ b/TAO/orbsvcs/Notify_Service/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/Notify_Service/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/TAO_Service/svc.conf.xml b/TAO/orbsvcs/TAO_Service/svc.conf.xml
index cc955f4885e..c5ec0f9b706 100644
--- a/TAO/orbsvcs/TAO_Service/svc.conf.xml
+++ b/TAO/orbsvcs/TAO_Service/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/TAO_Service/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Dynamically configure the naming service into the application process. -->
<!-- dynamic TAO_Naming_Loader Service_Object * TAO_CosNaming:_make_TAO_Naming_Loader () "dummy -o ns.ior" -->
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 72856f1663e..ea341893d7b 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Filter.h"
diff --git a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/external_idl.pl b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/external_idl.pl
index c5923350f83..babbc763a51 100755
--- a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/external_idl.pl
+++ b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/external_idl.pl
@@ -6,7 +6,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
# Author: Chad Elliott
# Date: 7/17/2007
# Description: A script to generate the Notify Service Monitor modules
-# $Id$
+#
# ******************************************************************
# ******************************************************************
diff --git a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
index 5392dd35250..f9359d00a7b 100755
--- a/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
+++ b/TAO/orbsvcs/examples/Notify/MC/TkMonitor/monitor.pl
@@ -4,7 +4,7 @@
# Description : Front end for the Notify Service Monitor
# Author : Chad Elliott
# Create Date : 7/17/2007
-# $Id$
+#
# ************************************************************
# ************************************************************
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a65f300fb3a..b2c9b7faf04 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Subscribe.h"
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml b/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml
index 8c526f5a8cb..bbe49a0a0b8 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/ec.conf.xml
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="static EC_Factory "-ECobserver basic ""/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml b/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml
index 39ef790c9d7..de04dda7001 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf.xml
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="static EC_Gateway_IIOP_Factory "-ECGIIOPConsumerECControl reconnect -ECGIIOPConsumerECControlPeriod 1000000 -ECGIIOPConsumerECControlTimeout 500000 -ECGIIOPUseConsumerProxyMap 0"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml
index 41409e40ec9..a81eb81f47f 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- change SCHED_OTHER to SCHED_FIFO or SCHED_RR to run in Real time class -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching kokyu SCHED_OTHER -ECscheduling kokyu -ECfiltering kokyu -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml
index 159faa97abc..2210b9ed5fb 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/MCast/svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/RtEC/MCast/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml b/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml
index 8d634c164f8..a43aac4f5ca 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/RtEC/Schedule/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECdispatching priority -ECscheduling priority -ECfiltering priority -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml b/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml
index 63807cba8d3..36f9241e205 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml
+++ b/TAO/orbsvcs/examples/RtEC/Simple/ec.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/RtEC/Simple/ec.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl
index f2c1b7ecbdf..195a9194739 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface SLevel1_Server
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml
index 957235c7149..243182b819f 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/Security/Send_File/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml
index a008b48bff7..49d5ab1b3ca 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml
+++ b/TAO/orbsvcs/examples/Security/Send_File/client_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/Security/Send_File/client_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml
index ffcee284699..45bb4f2ad53 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/Security/Send_File/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml
index bb29d1e558d..1e5ceb06bd9 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml
+++ b/TAO/orbsvcs/examples/Security/Send_File/server_none.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/Security/Send_File/server_none.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml b/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml
index 9e391e67290..5388822f9fc 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml
+++ b/TAO/orbsvcs/examples/Security/Send_File/server_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/examples/Security/Send_File/server_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test.idl b/TAO/orbsvcs/examples/Security/Send_File/test.idl
index a62d8becc91..983dac70adf 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test.idl
+++ b/TAO/orbsvcs/examples/Security/Send_File/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Pluggable_Framework.html b/TAO/orbsvcs/orbsvcs/AV/AV_Pluggable_Framework.html
index ca4db983b3c..38f6fe148e0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Pluggable_Framework.html
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Pluggable_Framework.html
@@ -1,4 +1,4 @@
-<!$Id$>
+<!>
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index e5922bd5664..31c15407dea 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -3,7 +3,7 @@
//=============================================================================
/**
* @file Resource_Factory.h
- * $Id$
+ *
*
* @author Yamuna Krishnamurthy
*/
diff --git a/TAO/orbsvcs/orbsvcs/CosTypedEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosTypedEventChannelAdmin.idl
index 5a809fb1642..400842dd675 100644
--- a/TAO/orbsvcs/orbsvcs/CosTypedEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTypedEventChannelAdmin.idl
@@ -3,7 +3,7 @@
/**
* @file CosTypedEventChannelAdmin.idl
*
-* $Id$
+*
*
* @brief Part of the Event Service
* See http://www.omg.org/docs/formal/01-03-01.pdf
diff --git a/TAO/orbsvcs/orbsvcs/CosTypedEventComm.idl b/TAO/orbsvcs/orbsvcs/CosTypedEventComm.idl
index a210c06d616..03b5174685a 100644
--- a/TAO/orbsvcs/orbsvcs/CosTypedEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTypedEventComm.idl
@@ -3,7 +3,7 @@
/**
* @file CosTypedEventComm.idl
*
-* $Id$
+*
*
* @brief Part of the Event Service
* See http://www.omg.org/docs/formal/01-03-01.pdf
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
index 5799f06d17c..b2c6c220e7c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -5,7 +5,7 @@
*
* @author Marina Spivak <marina@atdesk.com>
*
- * $Id$
+ *
*/
#ifndef EC_CHANNEL_DESTROYER__H_
#define EC_CHANNEL_DESTROYER__H_
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
index 8f3ec8fdbe9..89b5f0d862c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -5,7 +5,7 @@
*
* @author Carlos O'Ryan <coryan@atdesk.com>
*
- * $Id$
+ *
*/
#ifndef EC_PROXY_DISCONNECTOR__H_
#define EC_PROXY_DISCONNECTOR__H_
diff --git a/TAO/orbsvcs/orbsvcs/LB_ORT.idl b/TAO/orbsvcs/orbsvcs/LB_ORT.idl
index 0134ff0cc96..64ebd9454b3 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ORT.idl
+++ b/TAO/orbsvcs/orbsvcs/LB_ORT.idl
@@ -4,7 +4,7 @@
/**
* @file LB_ORT.idl
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 8431950aff4..1c4e978785e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -4,7 +4,7 @@
/**
* @file LB_ClientComponent.h
*
- * $Id$
+ *
* @author Ossama Othman <ossama@uci.edu>
*/
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 26273daab93..1588f15a958 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -4,7 +4,7 @@
/**
* @file LB_Component.h
*
- * $Id$
+ *
* @author Ossama Othman <ossama@uci.edu>
*/
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 5a45b571013..c509139b550 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -4,7 +4,7 @@
/**
* @file LB_IORInterceptor.h
*
- * $Id$
+ *
* @author Ossama Othman <ossama@uci.edu>
*/
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 7bde61ebbb8..694d452a03f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -4,7 +4,7 @@
/**
* @file LB_ObjectReferenceFactory.h
*
- * $Id$
+ *
* @author Ossama Othman <ossama@uci.edu>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Log/eventlog_export.h b/TAO/orbsvcs/orbsvcs/Log/eventlog_export.h
index 2b21d1f4463..a53c8865b6e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/eventlog_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/eventlog_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/eventlog_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/eventlog_serv_export.h
index f3537333c31..5f3aa86c228 100644
--- a/TAO/orbsvcs/orbsvcs/Log/eventlog_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/eventlog_serv_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/eventlog_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/eventlog_skel_export.h
index f0d5cb23cf2..f57f385dcfd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/eventlog_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/eventlog_skel_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/log_export.h b/TAO/orbsvcs/orbsvcs/Log/log_export.h
index 97ea3366e3e..64006e45002 100644
--- a/TAO/orbsvcs/orbsvcs/Log/log_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/log_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// log_export.h,v 1.2 2000/10/10 22:16:02 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/log_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/log_serv_export.h
index 000f75e5922..bf0dd0d3a8d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/log_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/log_serv_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// log_serv_export.h,v 1.2 2000/10/10 22:16:02 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/log_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/log_skel_export.h
index db1ff0231fc..9ec6b24f1e1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/log_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/log_skel_export.h
@@ -1,6 +1,6 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// log_skel_export.h,v 1.2 2000/10/10 22:16:02 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/notifylog_export.h b/TAO/orbsvcs/orbsvcs/Log/notifylog_export.h
index c9f1d99ef4e..9a480a5ba83 100644
--- a/TAO/orbsvcs/orbsvcs/Log/notifylog_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/notifylog_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/notifylog_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/notifylog_serv_export.h
index b9a3c655dc8..e8ac6daf3f4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/notifylog_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/notifylog_serv_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/notifylog_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/notifylog_skel_export.h
index b810fa8bb69..6e1c98c1eab 100644
--- a/TAO/orbsvcs/orbsvcs/Log/notifylog_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/notifylog_skel_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_export.h
index 9ad106e8d33..3d7cc9ea0ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/rteventlog_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h
index c3791cd48ae..62a22f80720 100644
--- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h
index bd0276592f9..4fa32f558f3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 6a4f41e219c..441b3d556d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "orbsvcs/Notify/FilterAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
index 6aa695f0e4a..906a3e37930 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.h
@@ -4,7 +4,7 @@
/**
* @file Name_Value_Pair.h
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
index b5fa036f8d0..55bbdca6a3d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -2,7 +2,7 @@
/**
* @file Reconnect_Worker_T.cpp
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
index 92f136b087b..3e1435452e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -4,7 +4,7 @@
/**
* @file Reconnect_Worker_T.h
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
index 941d3ae1872..c5c7b6571d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -2,7 +2,7 @@
/**
* @file Save_Persist_Worker_T.cpp
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
index 3758f68756e..f93425f5a2c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
@@ -4,7 +4,7 @@
/**
* \file Save_Persist_Worker_T.h
*
-* $Id$
+*
*
* \author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 73ce031dd4a..b0eb62e4d9e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -4,7 +4,7 @@
/**
* @file Topology_Object.h
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 9e81adf589c..1c16a686b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -4,7 +4,7 @@
/**
* @file Topology_Saver.h
*
-* $Id$
+*
*
* @author Jonathan Pollack <pollack_j@ociweb.com>
*/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
index 0eb75f4721c..861ebfd7ef5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "orbsvcs/Log_Macros.h"
#include "Validate_Client_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
index d72f07bb5f0..8775f6dfea0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef NOTIFY_VALIDATE_WORKER_CPP
#define NOTIFY_VALIDATE_WORKER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
index eb1f3c16cc9..f6c68fe5baa 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
@@ -4,7 +4,7 @@
/**
* @file PortableGroup.idl
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index d2197af7fc7..bfeee3ecb36 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -17,7 +17,7 @@
// An SSL session id seed value. Needs not be too unique, just somewhat
// different. See the OpenSSL manual
static const unsigned char session_id_context_[] =
- "$Id$";
+ "";
// Protocol name prefix
static const char * const the_prefix[] = {"iiop", "ssliop"};
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
index cea38d78e06..df471da848e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
@@ -1,5 +1,3 @@
-// $Id$
-
#include "params_dup.h"
#include <openssl/asn1.h>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index 9daf1192701..f65cc5ae596 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -1,6 +1,6 @@
#ifndef lint
// static char const
-// yyrcsid[] = "$Id$";
+// yyrcsid[] = "";
#endif
#include "ace/os_include/os_stdlib.h"
#define YYBYACC 1
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index 7045cbc1840..3b11f729cbe 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -4,7 +4,7 @@
/**
* @file Interpreter_Utils.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
index 9a69e02b849..9f76922cd65 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
@@ -1,6 +1,5 @@
%{
- // $Id$
-// ========================================================================
+ // ========================================================================
//
// = LIBRARY
// orbsvcs
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- The file is empty, forcing the ORB to use its default configuration. -->
<!-- -->
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- The file is empty, forcing the ORB to use its default configuration. -->
<!-- -->
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
index c696f84f7c1..c423959cc06 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
index e50b5ee76a0..59724386db0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
index 3af46f8016d..561f347f8e3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching mt -ECDispatchingThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
index 556a11f3e02..d3d7afdc4b5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null -ECDispatching reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
index bc2303a1caf..d2585db2396 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter per-supplier -ECDispatching reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
index aad39607a11..39d7ce56b1e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
index ddb4ff44a7c..88d391fa4dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
index a7abef8d899..1b9231f807c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
index ebe10379b5b..0b6104a08cb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
index 3e71148d35b..e419fe86f4f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
index 86ba9fd5fbf..803b51fac1d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
index c10ec68a86d..009fd8b2c5c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
index f74abe683cf..123297d1fc2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECDispatching reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
index cad852179de..d46256bdc47 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping continuous"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
index 2ad5c61621a..a8620197797 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECDispatching mt -ECDispatchingThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
index 72146ccc298..434202d9c59 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_read:list -ECProxyPushSupplierCollection mt:copy_on_read:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
index 73a63bf5ba9..dd8c64b6757 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
index b2461181885..324d2af368c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
index 37ab7100c94..b77daa62b2d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
index 5d41dbe8e18..0f746aaafa9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECSupplierFilter null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
index 81245d1f970..089ed4650a6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECSupplierFilter per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
index 3c6656cc873..2f528fa5b55 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
index 66344be0f08..674b092175f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.inl
@@ -1,7 +1,7 @@
/**
* @file ORB_Task.inl
*
-` * $Id$
+` *
*
* @author Carlos O'Ryan <coryan@uci.edu>
*/
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
index ac24f29094c..356038b93e7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.inl
@@ -1,7 +1,7 @@
/**
* @file ORB_Task_Activator.inl
*
-` * $Id$
+` *
*
* @author Carlos O'Ryan <coryan@uci.edu>
*/
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
index b620c992a2d..8f21054cd43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.inl
@@ -1,7 +1,7 @@
/**
* @file Send_Task_Stopper.inl
*
-` * $Id$
+` *
*
* @author Carlos O'Ryan <coryan@uci.edu>
*/
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
index 147a3e53769..5cfe99c9ef9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.inl
@@ -1,7 +1,7 @@
/**
* @file Task_Activator.inl
*
-` * $Id$
+` *
*
* @author Carlos O'Ryan <coryan@uci.edu>
*/
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml
index d838f4e9eeb..c76f336f99d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- This configuration file is used to use only the default TAO -->
<!-- strategies -->
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
index 0f0e38f5e02..86ec81dde62 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/AVStreams/Latency/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
index 705c51a7f77..3b67a483991 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/components_svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/AVStreams/Multicast/components_svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" -->
<!-- static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0" -->
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
index 4baaf351a7f..1c0bc4d4168 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="AV_Default_Resource_Factory" type="Service_Object">
<initializer path="TAO_AV" init="_make_TAO_AV_Default_Resource_Factory"/>
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
index ecca7fffd42..10595709acd 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index 6dc4fb2876b..a70affd9512 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index ed30383aacc..0e861d9a1a5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index d4ede34bf6b..5272fa90975 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -21,7 +21,7 @@
#include "tao/PI_Server/PI_Server.h"
/**
-* $Id$
+*
*/
class TAO249_ServerRequest_Interceptor
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index a2c88f6ddce..638e80f9f46 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -22,7 +22,7 @@
#include "tao/TimeBaseC.h"
/**
-* $Id$
+*
*/
class TAO249_ServerRequest_Interceptor2
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index eba911281cc..abdaa52515f 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index 0f48024748b..b9d0e338a50 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -22,7 +22,7 @@
#include "tao/TimeBaseC.h"
/**
-* $Id$
+*
*/
class TAO249_ServerRequest_Interceptor2
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index ed30383aacc..0e861d9a1a5 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 1085209cac6..93e9eb36f98 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -21,7 +21,7 @@
#include "tao/PI_Server/PI_Server.h"
/**
-* $Id$
+*
*/
class ServerRequest_Interceptor2
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
index ca7207b5aa4..c10ede435ba 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER2_H
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
index 0f48024748b..b9d0e338a50 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -22,7 +22,7 @@
#include "tao/TimeBaseC.h"
/**
-* $Id$
+*
*/
class TAO249_ServerRequest_Interceptor2
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
index 6b53d4ca40f..02a81530d91 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
#ifndef TAO249_SERVER_ORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
index b28599c118a..01c77066859 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
@@ -21,7 +21,7 @@
#include "tao/PI_Server/PI_Server.h"
/**
-* $Id$
+*
*/
class TAO249_ServerRequest_Interceptor
: public virtual PortableInterceptor::ServerRequestInterceptor,
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
index 1c0ca44b138..f84c6801c0e 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h
@@ -4,7 +4,7 @@
/**
* @file ClientORBInitializer.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTORBINITIALIZER_H
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
index 36e4fc7032d..3fddceaa252 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h
@@ -3,7 +3,7 @@
/**
* @file ClientRequest_Interceptor.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTREQUEST_INTERCEPTOR_H
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.y b/TAO/orbsvcs/tests/Concurrency/CC_command.y
index 339c8e47084..76a92e59b23 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.y
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.y
@@ -1,4 +1,4 @@
-/* $Id$
+/*
* ============================================================================
*
* = LIBRARY
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index 136dd3e56f8..a3a9fb0ffe6 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Id$
+ *
*/
#define FLEX_SCANNER
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
index 79cf07751ca..5a200c8d714 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/CosEvent/Basic/svc.pull.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="CEC_Factory" params="-CECReactivePullingPeriod 10000"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml b/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml
index f818a1c2ddf..a17a13927b1 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml
+++ b/TAO/orbsvcs/tests/EC_Mcast/svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/EC_Mcast/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier -ECObserver basic"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml
index 33c1ba2e392..bced78baf64 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/EC_Throughput/ec.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml
index af8714ddd69..814fc4d5760 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/EC_Throughput/ec_mt.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml
index c41467e01df..514c159ad9c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec_mt_overflow.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ec_mt_overflow.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_QueueFullSimpleActions" params="discard"/>
<static id="EC_Factory" params="-ECDispatching mt -ECDispatchingThreads 4 -ECFiltering basic -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/>
<static id="Client_Strategy_Factory" params="-ORBConnectStrategy blocked -ORBClientConnectionHandler RW -ORBTransportMuxStrategy exclusive" />
diff --git a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
index 555bb676ccd..1df2cd96b60 100644
--- a/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/control.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Event/Basic/control.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="EC_Factory" params="-ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml
index 9eb9319264f..eae68077083 100644
--- a/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/mt.svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Basic/mt.svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECObserver null -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml b/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml
index 3629833dff0..e2122256623 100644
--- a/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/observer.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Basic/observer.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECDispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml b/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml
index d4961bedca2..c2894b983c2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/sched.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Basic/sched.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="EC_Factory" type="Service_Object">
<initializer path="TAO_RTSchedEvent" init="_make_TAO_EC_Sched_Factory" params="-ECDispatching priority -ECScheduling priority -ECFiltering priority -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECSupplierFiltering per-supplier"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml
index 7a4a28be570..0eef70d5f67 100644
--- a/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/svc.complex.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Basic/svc.complex.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:delayed:list -ECProxyPushSupplierCollection mt:delayed:list -ECdispatching reactive -ECfiltering prefix -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml b/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml
index 491ecb5aeb9..9a11d290582 100644
--- a/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Basic/svc.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Basic/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml
index 0ca6716f58b..e8fc7b446ff 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.list.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Performance/ec.list.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection st:delayed:list -ECProxyPushSupplierCollection st:delayed:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml
index cd1467b5bed..5c91eccf859 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Performance/ec.mt.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection mt:immediate:list -ECProxyPushSupplierCollection mt:immediate:list -ECDispatching mt -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECsupplierfiltering per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml
index 25f61beac48..ce571f163a4 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.rb_tree.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Performance/ec.rb_tree.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection st:delayed:rb_tree -ECProxyPushSupplierCollection st:delayed:rb_tree -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml
index 16f28063d63..bd83ac59507 100644
--- a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Performance/ec.st.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="EC_Factory" params="-ECProxyPushConsumerCollection st:immediate:list -ECProxyPushSupplierCollection st:immediate:list -ECdispatching reactive -ECfiltering null -ECproxyconsumerlock null -ECproxysupplierlock null -ECsupplierfiltering null"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml b/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml
index 068e45df3d0..e3a45e8fa1f 100644
--- a/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml
+++ b/TAO/orbsvcs/tests/Event/Performance/latency.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Event/Performance/latency.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- tp is now the default reactor type -->
<!-- static Resource_Factory "-ORBReactorType tp" -->
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/orbsvcs/tests/Event/UDP/Test.idl b/TAO/orbsvcs/tests/Event/UDP/Test.idl
index fc1724d9993..61dd3f4b766 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Test.idl
+++ b/TAO/orbsvcs/tests/Event/UDP/Test.idl
@@ -1,4 +1,4 @@
-//$Id$:
+//:
#ifndef TAO_RTEC_MCAST_TEST_IDL
#define TAO_RTEC_MCAST_TEST_IDL
diff --git a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
index 3e6b6eb22aa..04f32103189 100644
--- a/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Event/UDP/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/examples/RtEC/MCast/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="EC_Factory" params="-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list -ECDispatching reactive -ECScheduling null -ECFiltering prefix -ECSupplierFilter per-supplier"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml
index 37af1733d3b..27161f70295 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/windows.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
index be93f9abea5..f94bc835865 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/FaultTolerance/IOGR/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="FT_ClientService_Activate" type="Service_Object">
<initializer path="TAO_FT_ClientORB" init="_make_TAO_FT_ClientService_Activate"/>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl
index c3e5912526d..5d63610f4f8 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
index 0c712977222..a8f4c8691e3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
index ce9567b6972..4fe622f87c7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/build.xml b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/build.xml
index 8cf25a49900..404303cfa1c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/build.xml
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/build.xml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- -->
<project name="TAO-JacORB AnyTypeCode interop test" default="compile" basedir=".">
<property environment="env"/>
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
index e32e17d17bb..0b930b42c3b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
index 45e7389c8df..b9735f7c344 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp
index 0f04632bbfc..cc3ffd8f59a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Terminator.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
index d34f8981d8b..dc273fb947f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Terminator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "ace/Task_T.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
index e1f3f5a9288..178ccf3f4da 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
index 61e70f984d4..d9e0964b1bf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.cpp
index 88fb72467bf..707e566eb81 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Terminator.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
index 29be200f03e..41134bedca9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "ace/Task_T.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
index 8e068fd14cb..29c74f751b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "Terminator.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
index 08b4d5ad8a3..c5ba93916d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
index 0c712977222..a8f4c8691e3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
index ce9567b6972..4fe622f87c7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
index 2074d575cdd..db7abc4244c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "ace/OS_NS_unistd.h"
#include "Test_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
index a4df6526a4d..1bbfb1e7c7b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
index 5828cb62c5e..460050bc9ec 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "test_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
index 542a74f6946..fdf55c85fd1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
index 8dbaac418eb..ad5344fbc6f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
index 3f34acd8886..65889da6a57 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp
index 0582552fdce..08b41dd1e04 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h
index 9693977cc8c..4c4c52394a0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp
index dcc7b321698..57a31fd0f16 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h
index 2be4baefa37..d43ae9d214f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
index b623f0e3c55..d5cf29e551f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h
index e39992d776e..e936e9edc6f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp
index 88fb72467bf..707e566eb81 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Terminator.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
index 29be200f03e..41134bedca9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "ace/Task_T.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
index 4c64b73bb3a..524455780c1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Test_i.h"
#include "Terminator.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.h
index 705c35a57a0..05c91c4c75e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef TEST_I_H_
#define TEST_I_H_
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
index 37af1733d3b..27161f70295 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
index 3f408177e69..31793b087ff 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
index 37af1733d3b..27161f70295 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
index 37af1733d3b..27161f70295 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml b/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
index 5e59695a48b..ce35abad91e 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Miop/McastHello/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="UIPMC_Factory" type="Service_Object">
<initializer path="TAO_PortableGroup" init="_make_TAO_UIPMC_Protocol_Factory"/>
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml b/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
index a7375a33b72..f103ffb4279 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Miop/McastHello/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="UIPMC_Factory" type="Service_Object">
<initializer path="TAO_PortableGroup" init="_make_TAO_UIPMC_Protocol_Factory"/>
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf.xml
index a499d551e4b..f052be85bde 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Blocking/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf.xml
index a499d551e4b..f052be85bde 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Blocking/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf.xml
index 28ddad339b4..fe9f59310ba 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Bug_2415_Regression/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="TAO_CosNotify_Service" params="-DispatchingThreads 1 -DefaultConsumerAdminFilterOp AND -DefaultSupplierAdminFilterOp AND"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf.xml b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf.xml
index f2fcf8da017..ce4a7a58a86 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Bug_2415_Regression/notify2.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="TAO_CosNotify_Service" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf.xml
index 33ecd35e7db..1ee135e61ac 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Discarding/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf.xml
index 33ecd35e7db..1ee135e61ac 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Discarding/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Discarding/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/MC/notify.conf.xml b/TAO/orbsvcs/tests/Notify/MC/notify.conf.xml
index d64854e8bfd..b4d78d5e268 100644
--- a/TAO/orbsvcs/tests/Notify/MC/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/MC/notify.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<dynamic id="TAO_MonitorAndControl" type="Service_Object">
<initializer path="TAO_CosNotification_MC" init="_make_TAO_MonitorAndControl" params="-o monitor.ior"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml
index 725528eac0c..33aef54bc2a 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/MT_Dispatching/notify_mtdispatching.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml
index fe5182ff88a..916e8082946 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/MT_Dispatching/notify_mtsource.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1 -SourceThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml
index 6e3f08e4341..6de46b9492c 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/MT_Dispatching/notify_nothreads.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Ordering/notify.conf.xml
index 5c15de81fdc..07a03d09150 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Ordering/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Ordering/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 548705dcfe7..72ff4e07736 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Filter.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
index f7c13b36c47..4072fc91d68 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
@@ -1,6 +1,6 @@
/* -*- C++ -*- */
/**
- * $Id$
+ *
*/
#ifndef TEST_SAVER_H
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index f1cb98b71af..f7c92e58faf 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
@@ -1,5 +1,5 @@
/**
- * $Id$
+ *
*/
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml
index d03fcf8be90..d4e13c46520 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml
index 829d9ba2935..936dc7dd519 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/Sequence_Multi_Filter/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf.xml
index 2b31cbac10e..e553aff200a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf.xml b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf.xml
index de91c2e237a..dd94153ab38 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/notify.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index b3facca03e6..29cac7774ed 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -1,5 +1,5 @@
/**
- * $Id$
+ *
*/
#include "orbsvcs/CosNotificationC.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml
index f398f140957..aa06053b88f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/notify.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/Filter/notify.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
index 721457a7d45..edb20f4cec0 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
index 5e3a436e51a..8f5a97be5c5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-AllocateTaskperProxy -SourceThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
index d2e20177daf..836b67a0e19 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
index fb2f0477d6a..28659f090de 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Resource_Factory" params="-ORBReactorMaskSignals 0"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml
index d14d7475b5d..0efdff68187 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Big_Request/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml
index 5e92069a8c2..5d2d25e2eee 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Big_Request/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml
index 23f6c11bb67..774bb7d6832 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Bug_1107_Regression/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml
index 934ac5223e3..ac78e1155f2 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Bug_1107_Regression/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
index 0983a2534ff..920b4cf175a 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include "Client_Task.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
index 27164b61d41..577f1bf672c 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml b/TAO/orbsvcs/tests/Security/Callback/client.conf.xml
index c82a523bd48..6fd2f1e3c2c 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Callback/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Callback/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index ae1d1405e9b..c359db5051a 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -4,7 +4,7 @@
/**
* @file client_i.h
*
- * $Id$ *
+ * *
* Header for the SSLIOP Callback test client callback implementation.
*
* @author Robert Martin <martin_r@ociweb.com>
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml b/TAO/orbsvcs/tests/Security/Callback/server.conf.xml
index dab23b5d802..e3350eb5147 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Callback/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Callback/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test.idl b/TAO/orbsvcs/tests/Security/Crash_Test/test.idl
index a62d8becc91..983dac70adf 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test.idl
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml
index 6e34a5555df..bec74388c75 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/client-key.pem -SSLCertificate PEM:ssl/client-cert.pem -SSLCAFile PEM:ssl/ca.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml
index bc593d14981..a21343dd99a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_BiDir/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/server-key.pem -SSLCertificate PEM:ssl/server-cert.pem -SSLCAFile PEM:ssl/ca.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
index c8eebf9479a..cfa6247eaac 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
index 4bd4209ae7b..c949c05b7ac 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
index c8eebf9479a..cfa6247eaac 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
index 4bd4209ae7b..c949c05b7ac 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml
index 1da905c629b..300e8e84ece 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLNoProtection -SSLAuthenticate SERVER -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml
index 6459901ee3b..a213e58a24e 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLNoProtection -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml
index f68baa15979..b1f940db934 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml
index 8060c28b75a..3913117f8bf 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml
index e4acefdf26a..2d4d881e278 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml
index 2b61ce1d547..e4c872670cf 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_none.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml
index 0b53b803d90..f1c6ec341b3 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml
index f68baa15979..b1f940db934 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml
index 8060c28b75a..3913117f8bf 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml
index e4acefdf26a..2d4d881e278 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml
index 2b61ce1d547..e4c872670cf 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_none.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_none.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml
index 0b53b803d90..f1c6ec341b3 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server_nopasswd.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
index 05cf30bf5f9..2c3d7a968a5 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger.idl
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// messenger.idl
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
index 2011be2c41b..72b4e40c9e7 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
index 6e8c488cbc9..d34cb1fa329 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
index 69da3a8479b..ed4ef394a2f 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
// TAO and the TAO IDL Compiler have been developed by the Center for
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
index f1bf1ac51f7..22c3e57f6aa 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
index 022434ab6bb..07f30d2bf73 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"/>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
index 2a9f4817260..57fcd5341f6 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SSLIOP_Factory" type="Service_Object">
<initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf.xml b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf.xml
index bcd306a2e9a..d2ab0013cc8 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf.xml
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- # $Id$ -->
+ <!-- # -->
<dynamic id="TAO_MonitorAndControl" type="Service_Object">
<initializer path="TAO_CosNotification_MC" init="_make_TAO_MonitorAndControl" params="-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"/>
</dynamic>
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
index 80eeb79c3b6..a0e36769ada 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="TAO_MonitorAndControl" type="Service_Object">
<initializer path="TAO_CosNotification_MC" init="_make_TAO_MonitorAndControl" params="-NoNameSvc -ORBArg -ORBListenEndpoints -ORBArg iiop://127.0.0.1:32101"/>
diff --git a/TAO/performance-tests/Callback/svc.conf.xml b/TAO/performance-tests/Callback/svc.conf.xml
index 59e121e7a54..1637f7881e2 100644
--- a/TAO/performance-tests/Callback/svc.conf.xml
+++ b/TAO/performance-tests/Callback/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Callback/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
index 163ec651984..0b63c010b29 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
index 0b606fc3de0..e01355b8299 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"/>
</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
index 60269f5dee6..f011caf3c63 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
index f1ae2150eab..029e8d045e6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
index e26cbd04d3d..99b960b249b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
index 32ae378187c..90fff85098c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
index 20e85bd18d2..402875841e1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
index 73ad6ac6461..2ad60dfbdf9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Cubit/TAO/MT_Cubit/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/Latency/DII/svc.conf.xml b/TAO/performance-tests/Latency/DII/svc.conf.xml
index c10d08fced6..6e7e2085a4a 100644
--- a/TAO/performance-tests/Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DII/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/DII/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Latency/DSI/svc.conf.xml b/TAO/performance-tests/Latency/DSI/svc.conf.xml
index 24c49a25937..0b73e135ba7 100644
--- a/TAO/performance-tests/Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Latency/DSI/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/DSI/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
index 441a106aacf..7e8ab0433b7 100644
--- a/TAO/performance-tests/Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Deferred/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Deferred/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml b/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
+++ b/TAO/performance-tests/Latency/Single_Threaded/default.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- The file is empty, forcing the ORB to use its default configuration. -->
<!-- -->
diff --git a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
index 30eb65ebcfa..cc0abd141b3 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Thread_Per_Connection/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml b/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
index d47d971ed22..9c6bb47513c 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Thread_Pool/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Thread_Pool/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
index 1e844f40b31..b12356f618c 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/POA/Object_Creation_And_Registration/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
index af6a5733f14..17556649207 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
<static id="Client_Strategy_Factory" params="-ORBclientconnectionhandler RW"/>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
index 7fa80454210..a9522a46e66 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
index 3a282684378..d38c169dbc6 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct"/>
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
index 6ce06ee56d2..39f28fde3ab 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
<static id="RT_ORB_Loader"/>
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
index 9ca2ca16aff..120f375b167 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from native-svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- For testing of RT threads (with native priority) -->
<static id="RT_ORB_Loader" params="-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"/>
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml b/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
index a26f8ec17a1..7c583cc29ef 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for exclusive transport strategy -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE"/>
diff --git a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
index c10d08fced6..6e7e2085a4a 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DII/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/DII/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
index 24c49a25937..0b73e135ba7 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/DSI/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/DSI/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
index 441a106aacf..7e8ab0433b7 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Deferred/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
index 03ac9dfa183..ecc80c20b90 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/default.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./performance-tests/Latency/Single_Threaded/default.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- The file is empty, forcing the ORB to use its default configuration. -->
<!-- -->
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
index 51612b28d17..69696c83a17 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Single_Threaded/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
<static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
index 30eb65ebcfa..cc0abd141b3 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Thread_Per_Connection/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt -ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
index d47d971ed22..9c6bb47513c 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Latency/Thread_Pool/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBFlushingStrategy blocking"/>
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW"/>
diff --git a/TAO/performance-tests/Throughput/svc.conf.xml b/TAO/performance-tests/Throughput/svc.conf.xml
index ca9d6874ff5..681c74e31b3 100644
--- a/TAO/performance-tests/Throughput/svc.conf.xml
+++ b/TAO/performance-tests/Throughput/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./performance-tests/Throughput/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h
index 2db9b7e690a..509e519eda0 100644
--- a/TAO/tao/Dynamic_TP/DTP_Task.h
+++ b/TAO/tao/Dynamic_TP/DTP_Task.h
@@ -4,7 +4,7 @@
/**
* @file DTP_Task.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tao/ImR_Client/ImplRepo.idl b/TAO/tao/ImR_Client/ImplRepo.idl
index 8c427adbe34..14d05c50c32 100644
--- a/TAO/tao/ImR_Client/ImplRepo.idl
+++ b/TAO/tao/ImR_Client/ImplRepo.idl
@@ -1,7 +1,7 @@
// -*- IDL -*-
/**
- * $Id$
+ *
*/
#ifndef TAO_IMRCLIENT_IMPLREPO_PIDL
diff --git a/TAO/tao/ImR_Client/ServerObject.idl b/TAO/tao/ImR_Client/ServerObject.idl
index e14c68e42c7..bd906937f33 100644
--- a/TAO/tao/ImR_Client/ServerObject.idl
+++ b/TAO/tao/ImR_Client/ServerObject.idl
@@ -1,7 +1,7 @@
// -*- IDL -*-
/**
- * $Id$
+ *
*/
#ifndef TAO_IMRCLIENT_SERVEROBJECT_PIDL
diff --git a/TAO/tao/Invocation_Retry_Params.h b/TAO/tao/Invocation_Retry_Params.h
index ff8b67e58cb..29d42c56d85 100644
--- a/TAO/tao/Invocation_Retry_Params.h
+++ b/TAO/tao/Invocation_Retry_Params.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
//=============================================================================
/**
* @file Invocation_Retry_Params.h
diff --git a/TAO/tao/Invocation_Retry_State.h b/TAO/tao/Invocation_Retry_State.h
index e68bb509b1d..19280efe312 100644
--- a/TAO/tao/Invocation_Retry_State.h
+++ b/TAO/tao/Invocation_Retry_State.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
//=============================================================================
/**
* @file Invocation_Retry_State.h
diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h
index 049e3e26d41..6f97907b2e5 100644
--- a/TAO/tao/Messaging/Messaging_Loader.h
+++ b/TAO/tao/Messaging/Messaging_Loader.h
@@ -4,7 +4,7 @@
/**
* @file Messaging_Loader.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index bd1ea2cab89..8c3c73adf0a 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,4 +1,4 @@
-// "$Id$"
+// ""
#include "tao/ORB.h"
#include "tao/ORB_Table.h"
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 27dd677a89e..1570f29d3a6 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -1,4 +1,4 @@
-// @(#) $Id$
+// @(#)
//
// Copyright 1994-1995 by Sun Microsystems Inc.
// Copyright 1997-2002 by Washington University
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h
index 58b691f7647..0547ab61170 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.h
+++ b/TAO/tao/PI_Server/PI_Server_Loader.h
@@ -4,7 +4,7 @@
/**
* @file PI_Server_Loader.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
index 5ab38b523c2..21b397bf978 100644
--- a/TAO/tao/PolicyS.h
+++ b/TAO/tao/PolicyS.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$ */
+/* -*- C++ -*- */
//=============================================================================
/**
* @file PolicyS.h
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index 99e8bc75c66..ef9b689c0c5 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -4,7 +4,7 @@
/**
* @file POA_Guard.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 7e6e3ecb2fb..64d33420098 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -4,7 +4,7 @@
/**
* @file RequestProcessingStrategy.cpp
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index f4190450d8d..fe494199cc0 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -4,7 +4,7 @@
/**
* @file TAO_Server_Request.h
*
-* $Id$
+*
*
* Header file for CORBA's Server Skeleton Interface's
* "Server Request" type.
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index 05f0072cd16..a7d7df325c3 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -1,4 +1,4 @@
-// "$Id$"
+// ""
#include "tao/Valuetype/AbstractBase.h"
#include "tao/Valuetype/ValueBase.h"
diff --git a/TAO/tests/AMI/exclusive.conf.xml b/TAO/tests/AMI/exclusive.conf.xml
index 9cc9202775a..ce532bac57a 100644
--- a/TAO/tests/AMI/exclusive.conf.xml
+++ b/TAO/tests/AMI/exclusive.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/AMI/exclusive_rw.conf.xml b/TAO/tests/AMI/exclusive_rw.conf.xml
index d9fdac7d3ae..14c36b4eb50 100644
--- a/TAO/tests/AMI/exclusive_rw.conf.xml
+++ b/TAO/tests/AMI/exclusive_rw.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/>
<static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/>
diff --git a/TAO/tests/AMI/muxed.conf.xml b/TAO/tests/AMI/muxed.conf.xml
index 5700476defd..d292525af2c 100644
--- a/TAO/tests/AMI/muxed.conf.xml
+++ b/TAO/tests/AMI/muxed.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/AMI/server.conf.xml b/TAO/tests/AMI/server.conf.xml
index 413a4c4833b..687c469e333 100644
--- a/TAO/tests/AMI/server.conf.xml
+++ b/TAO/tests/AMI/server.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/AMI_Timeouts/svc.conf.xml b/TAO/tests/AMI_Timeouts/svc.conf.xml
index da7b72a0978..19c57a13ad7 100644
--- a/TAO/tests/AMI_Timeouts/svc.conf.xml
+++ b/TAO/tests/AMI_Timeouts/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI_Timeouts/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Big_Request_Muxing/svc.conf.xml b/TAO/tests/Big_Request_Muxing/svc.conf.xml
index 4fad63264d8..4ed37f36eb8 100644
--- a/TAO/tests/Big_Request_Muxing/svc.conf.xml
+++ b/TAO/tests/Big_Request_Muxing/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Big_Request_Muxing/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_2122_Regression/test.cpp b/TAO/tests/Bug_2122_Regression/test.cpp
index a9739dc2429..c07075aa074 100644
--- a/TAO/tests/Bug_2122_Regression/test.cpp
+++ b/TAO/tests/Bug_2122_Regression/test.cpp
@@ -1,7 +1,7 @@
/**
* @file test.cpp
*
- * $Id$
+ *
*/
#include "TestC.h"
diff --git a/TAO/tests/Bug_2124_Regression/test.cpp b/TAO/tests/Bug_2124_Regression/test.cpp
index a9739dc2429..c07075aa074 100644
--- a/TAO/tests/Bug_2124_Regression/test.cpp
+++ b/TAO/tests/Bug_2124_Regression/test.cpp
@@ -1,7 +1,7 @@
/**
* @file test.cpp
*
- * $Id$
+ *
*/
#include "TestC.h"
diff --git a/TAO/tests/Bug_2126_Regression/test.cpp b/TAO/tests/Bug_2126_Regression/test.cpp
index 8e924b096ec..134e6f8f6bc 100644
--- a/TAO/tests/Bug_2126_Regression/test.cpp
+++ b/TAO/tests/Bug_2126_Regression/test.cpp
@@ -1,7 +1,7 @@
/**
* @file test.cpp
*
- * $Id$
+ *
*/
#include "TestC.h"
diff --git a/TAO/tests/Bug_2669_Regression/Child.idl b/TAO/tests/Bug_2669_Regression/Child.idl
index fd35fee57e6..54d0f7c8302 100644
--- a/TAO/tests/Bug_2669_Regression/Child.idl
+++ b/TAO/tests/Bug_2669_Regression/Child.idl
@@ -1,7 +1,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tests/Bug_2669_Regression/Parent.idl b/TAO/tests/Bug_2669_Regression/Parent.idl
index e16e96124ec..7c672b3ff24 100644
--- a/TAO/tests/Bug_2669_Regression/Parent.idl
+++ b/TAO/tests/Bug_2669_Regression/Parent.idl
@@ -1,7 +1,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index f31dbbd56ca..b31b47c0eea 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -1,7 +1,7 @@
//=============================================================================
/**
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tests/Bug_2678_Regression/dribble.pl b/TAO/tests/Bug_2678_Regression/dribble.pl
index 3e10a136d4d..77a2c78ff7b 100755
--- a/TAO/tests/Bug_2678_Regression/dribble.pl
+++ b/TAO/tests/Bug_2678_Regression/dribble.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
# ******************************************************************
# Author: Chris Cleeland
# Date: 10/26/2002
-# $Id$
+#
# ******************************************************************
use Getopt::Long;
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 60ecbdeb32e..a84a878653a 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
#include "ace/Arg_Shifter.h"
diff --git a/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml b/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
index 0cece128ffe..e7383ad814e 100644
--- a/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
+++ b/TAO/tests/Bug_3251_Regression/Bug_3251.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- ACE will locate the libraries for you automatically by reading your LD -->
<!-- search path. Moreover, ACE will automatically insert the correct suffix -->
diff --git a/TAO/tests/Bug_3276_Regression/test.idl b/TAO/tests/Bug_3276_Regression/test.idl
index 6e89ce2f572..dac49455a5a 100644
--- a/TAO/tests/Bug_3276_Regression/test.idl
+++ b/TAO/tests/Bug_3276_Regression/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/tests/Bug_3470_Regression/test.cpp b/TAO/tests/Bug_3470_Regression/test.cpp
index 738f6902f92..8d22642ccd4 100644
--- a/TAO/tests/Bug_3470_Regression/test.cpp
+++ b/TAO/tests/Bug_3470_Regression/test.cpp
@@ -4,7 +4,7 @@
* launch test like this:
* <execname> -ORBInitRef MyObjectId=file://myobj.ior
*
- * $Id$
+ *
*/
#include "tao/ORB.h"
diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
index 1c0ca44b138..f84c6801c0e 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
+++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h
@@ -4,7 +4,7 @@
/**
* @file ClientORBInitializer.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTORBINITIALIZER_H
diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
index 36e4fc7032d..3fddceaa252 100644
--- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
+++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h
@@ -3,7 +3,7 @@
/**
* @file ClientRequest_Interceptor.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTREQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Bug_3801_Regression/exclusive.conf.xml b/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
index 9cc9202775a..ce532bac57a 100644
--- a/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
+++ b/TAO/tests/Bug_3801_Regression/exclusive.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3801_Regression/muxed.conf.xml b/TAO/tests/Bug_3801_Regression/muxed.conf.xml
index 5700476defd..d292525af2c 100644
--- a/TAO/tests/Bug_3801_Regression/muxed.conf.xml
+++ b/TAO/tests/Bug_3801_Regression/muxed.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3801_Regression/server.conf.xml b/TAO/tests/Bug_3801_Regression/server.conf.xml
index 8a4700799b4..828b3ba9349 100644
--- a/TAO/tests/Bug_3801_Regression/server.conf.xml
+++ b/TAO/tests/Bug_3801_Regression/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/AMI/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Bug_3953_Regression/svc.conf.xml b/TAO/tests/Bug_3953_Regression/svc.conf.xml
index 91c9afd3b3e..b8ed0bbe4c8 100644
--- a/TAO/tests/Bug_3953_Regression/svc.conf.xml
+++ b/TAO/tests/Bug_3953_Regression/svc.conf.xml
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'">
</ACE_Svc_Conf>
diff --git a/TAO/tests/CSD_Collocation/svc.conf.xml b/TAO/tests/CSD_Collocation/svc.conf.xml
index f5c0a307879..5c37f064dda 100644
--- a/TAO/tests/CSD_Collocation/svc.conf.xml
+++ b/TAO/tests/CSD_Collocation/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Collocation/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/tests/Collocation/svc.conf.xml b/TAO/tests/Collocation/svc.conf.xml
index f5c0a307879..5c37f064dda 100644
--- a/TAO/tests/Collocation/svc.conf.xml
+++ b/TAO/tests/Collocation/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Collocation/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/tests/Connect_Strategy_Test/blocked.conf.xml b/TAO/tests/Connect_Strategy_Test/blocked.conf.xml
index 3171e986573..53bbc2385c7 100644
--- a/TAO/tests/Connect_Strategy_Test/blocked.conf.xml
+++ b/TAO/tests/Connect_Strategy_Test/blocked.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Connect_Strategy_Test/blocked.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBConnectStrategy Blocked"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connect_Strategy_Test/reactor.conf.xml b/TAO/tests/Connect_Strategy_Test/reactor.conf.xml
index 1cb8ac86ea6..d5da8974a4c 100644
--- a/TAO/tests/Connect_Strategy_Test/reactor.conf.xml
+++ b/TAO/tests/Connect_Strategy_Test/reactor.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Connect_Strategy_Test/reactor.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBConnectStrategy Reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connection_Purging/client.fifo.conf.xml b/TAO/tests/Connection_Purging/client.fifo.conf.xml
index 6cd6478682c..8a697a5dc49 100644
--- a/TAO/tests/Connection_Purging/client.fifo.conf.xml
+++ b/TAO/tests/Connection_Purging/client.fifo.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Connection_Purging/client.fifo.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy fifo -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connection_Purging/client.lfu.conf.xml b/TAO/tests/Connection_Purging/client.lfu.conf.xml
index 36f43aa515a..534c970400f 100644
--- a/TAO/tests/Connection_Purging/client.lfu.conf.xml
+++ b/TAO/tests/Connection_Purging/client.lfu.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Connection_Purging/client.lfu.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy lfu -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connection_Purging/client.lru.conf.xml b/TAO/tests/Connection_Purging/client.lru.conf.xml
index b6929bb102c..9dfbe298c56 100644
--- a/TAO/tests/Connection_Purging/client.lru.conf.xml
+++ b/TAO/tests/Connection_Purging/client.lru.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Connection_Purging/client.lru.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy lru -ORBConnectionCacheMax 10 -ORBConnectionCachePurgePercentage 30"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connection_Purging/client.null.conf.xml b/TAO/tests/Connection_Purging/client.null.conf.xml
index 35e362fd0cc..8f4aa4b28d3 100644
--- a/TAO/tests/Connection_Purging/client.null.conf.xml
+++ b/TAO/tests/Connection_Purging/client.null.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Connection_Purging/client.null.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBConnectionPurgingStrategy null"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Connection_Purging/server_shmiop.conf.xml b/TAO/tests/Connection_Purging/server_shmiop.conf.xml
index 11b4d925774..41f5fcd045a 100644
--- a/TAO/tests/Connection_Purging/server_shmiop.conf.xml
+++ b/TAO/tests/Connection_Purging/server_shmiop.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Connection_Purging/server_shmiop.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp
index e8a310cb9cb..6a94f67d0f2 100644
--- a/TAO/tests/DII_AMI_Forward/client.cpp
+++ b/TAO/tests/DII_AMI_Forward/client.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- * $Id$
+ *
*/
#include "tao/DynamicInterface/Request.h" /* This must come first for
diff --git a/TAO/tests/DII_AMI_Forward/test.idl b/TAO/tests/DII_AMI_Forward/test.idl
index bb01a0dcbb4..a5c57fbfca6 100644
--- a/TAO/tests/DII_AMI_Forward/test.idl
+++ b/TAO/tests/DII_AMI_Forward/test.idl
@@ -1,7 +1,7 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: f; c-basic-offset: 2 -*- */
/*
- * $Id$
+ *
*/
#include "tao/PortableServer/ForwardRequest.pidl"
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
index 3e10a136d4d..77a2c78ff7b 100755
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
# ******************************************************************
# Author: Chris Cleeland
# Date: 10/26/2002
-# $Id$
+#
# ******************************************************************
use Getopt::Long;
diff --git a/TAO/tests/LongUpcalls/svc.conf.xml b/TAO/tests/LongUpcalls/svc.conf.xml
index 8fb8581c2a0..5bc775cc477 100644
--- a/TAO/tests/LongUpcalls/svc.conf.xml
+++ b/TAO/tests/LongUpcalls/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/LongUpcalls/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/>
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/>
diff --git a/TAO/tests/MProfile/test.idl b/TAO/tests/MProfile/test.idl
index a87da7f07d6..db652701358 100644
--- a/TAO/tests/MProfile/test.idl
+++ b/TAO/tests/MProfile/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/tests/MProfile_Connection_Timeout/test.idl b/TAO/tests/MProfile_Connection_Timeout/test.idl
index bcb13ea9378..7a55e3be7aa 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test.idl
+++ b/TAO/tests/MProfile_Connection_Timeout/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/tests/MProfile_Forwarding/test.idl b/TAO/tests/MProfile_Forwarding/test.idl
index 1f1e6389faf..f396ff72f46 100644
--- a/TAO/tests/MProfile_Forwarding/test.idl
+++ b/TAO/tests/MProfile_Forwarding/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/tests/MT_BiDir/server.conf.xml b/TAO/tests/MT_BiDir/server.conf.xml
index 462e723c4c5..d999f284589 100644
--- a/TAO/tests/MT_BiDir/server.conf.xml
+++ b/TAO/tests/MT_BiDir/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_BiDir/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Resource_Factory" params="-ORBMuxedConnectionMax 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/client.conf.xml b/TAO/tests/MT_Client/client.conf.xml
index df1fe9c2c4d..8b7a64f16fa 100644
--- a/TAO/tests/MT_Client/client.conf.xml
+++ b/TAO/tests/MT_Client/client.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_Client/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/client_muxed.conf.xml b/TAO/tests/MT_Client/client_muxed.conf.xml
index a03048a0550..2d3bed32590 100644
--- a/TAO/tests/MT_Client/client_muxed.conf.xml
+++ b/TAO/tests/MT_Client/client_muxed.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_Client/client_muxed.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/server.conf.xml b/TAO/tests/MT_Client/server.conf.xml
index d233dd6213f..f14289b0558 100644
--- a/TAO/tests/MT_Client/server.conf.xml
+++ b/TAO/tests/MT_Client/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_Client/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl
index 1c92c90a571..17e44564159 100644
--- a/TAO/tests/MT_Client/test.idl
+++ b/TAO/tests/MT_Client/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
/// A simple interface to test the ORB
diff --git a/TAO/tests/MT_Server/server.conf.xml b/TAO/tests/MT_Server/server.conf.xml
index 9c53575413f..bfcde8e9716 100644
--- a/TAO/tests/MT_Server/server.conf.xml
+++ b/TAO/tests/MT_Server/server.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/MT_Server/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
</ACE_Svc_Conf>
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml
index d9fdac7d3ae..14c36b4eb50 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml
+++ b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/>
<static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/>
diff --git a/TAO/tests/Muxing/svc.conf.xml b/TAO/tests/Muxing/svc.conf.xml
index 80c2dce69fe..c2c612f4023 100644
--- a/TAO/tests/Muxing/svc.conf.xml
+++ b/TAO/tests/Muxing/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Muxing/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
index e68a5b8e8ff..52907fac38e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/NestedUpcall/MT_Client_Test/client.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Client_Strategy_Factory" type="Service_Object">
<initializer path="TAO" init="_make_TAO_Default_Client_Strategy_Factory"/>
diff --git a/TAO/tests/NestedUpcall/Simple/svc.conf.xml b/TAO/tests/NestedUpcall/Simple/svc.conf.xml
index 020bc8449ea..1aff47aece0 100644
--- a/TAO/tests/NestedUpcall/Simple/svc.conf.xml
+++ b/TAO/tests/NestedUpcall/Simple/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/NestedUpcall/Simple/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- static Resource_Factory "-ORBReactorType tp" -->
<!-- static Server_Strategy_Factory "-ORBConcurrency thread-per-connection" -->
diff --git a/TAO/tests/Nested_Event_Loop/svc.conf.xml b/TAO/tests/Nested_Event_Loop/svc.conf.xml
index 981923d7a31..c3a37fde730 100644
--- a/TAO/tests/Nested_Event_Loop/svc.conf.xml
+++ b/TAO/tests/Nested_Event_Loop/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Nested_Event_Loop/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml
index fab257247f5..3906e7c0632 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml
+++ b/TAO/tests/No_Server_MT_Connect_Test/blocked.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/No_Server_MT_Connect_Test/blocked.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBConnectStrategy Blocked"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml
index 76c7d2eceba..d09d1c4be8a 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml
+++ b/TAO/tests/No_Server_MT_Connect_Test/reactor.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/No_Server_MT_Connect_Test/reactor.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Client_Strategy_Factory" params="-ORBConnectStrategy Reactive"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test.idl b/TAO/tests/No_Server_MT_Connect_Test/test.idl
index 1c92c90a571..17e44564159 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test.idl
+++ b/TAO/tests/No_Server_MT_Connect_Test/test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
/// A simple interface to test the ORB
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index 4cc5c75714d..b8b9c956432 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -2,7 +2,7 @@
* @author Iliyan jeliazkov <iliyan@ociweb.com>
* @author Lothar Werzinger <lothar@tradescape.biz>
*
- * $Id$
+ *
*/
#include "ace/Arg_Shifter.h"
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
index b87a9560f78..877cbd9de49 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h
@@ -2,7 +2,7 @@
* @author Iliyan jeliazkov <iliyan@ociweb.com>
* @author Lothar Werzinger <lothar@tradescape.biz>
*
- * $Id$
+ *
*/
#ifndef DllOrb_h
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
index 2787fec934f..cb105c98256 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
@@ -2,7 +2,7 @@
* @author Iliyan jeliazkov <iliyan@ociweb.com>
* @author Lothar Werzinger <lothar@tradescape.biz>
*
- * $Id$
+ *
*/
#include "ace/Service_Config.h"
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
index a83de7d8053..fc40ce45a8b 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from Service_Config_Test.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Dynamically loading each of the Service Objects below causes a -->
<!-- number of threads to be spawned, each one invoking the Service -->
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index afa4449f7b5..5456bca610c 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -4,7 +4,7 @@
/**
* @file ObjectReferenceFactory.h
*
- * $Id$
+ *
* @author Ossama Othman <ossama@uci.edu>
*/
diff --git a/TAO/tests/Object_Loader/svc.conf.xml b/TAO/tests/Object_Loader/svc.conf.xml
index 93b1f7c0c0e..615a047a214 100644
--- a/TAO/tests/Object_Loader/svc.conf.xml
+++ b/TAO/tests/Object_Loader/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./tests/Object_Loader/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="TAO_POA" type="Service_Object">
<initializer path="TAO_PortableServer" init="_make_TAO_Object_Adapter_Factory"/>
diff --git a/TAO/tests/OctetSeq/svc1.conf.xml b/TAO/tests/OctetSeq/svc1.conf.xml
index cfc3d7f7e1c..ec2ed6fa884 100644
--- a/TAO/tests/OctetSeq/svc1.conf.xml
+++ b/TAO/tests/OctetSeq/svc1.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/OctetSeq/svc1.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBInputCDRAllocator null"/>
diff --git a/TAO/tests/OctetSeq/svc2.conf.xml b/TAO/tests/OctetSeq/svc2.conf.xml
index 13d8e571ba0..db473a8b607 100644
--- a/TAO/tests/OctetSeq/svc2.conf.xml
+++ b/TAO/tests/OctetSeq/svc2.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/OctetSeq/svc2.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBInputCDRAllocator null"/>
diff --git a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
index 66c5699e835..5038f3a18a0 100644
--- a/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
+++ b/TAO/tests/POA/Explicit_Activation/alternate.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from ./examples/POA/Explicit_Activation/alternate.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Refer to Alternate_Resource_Factory/README for details -->
<dynamic id="Resource_Factory" type="Service_Object">
diff --git a/TAO/tests/POA/FindPOA/Adapter_Activator.h b/TAO/tests/POA/FindPOA/Adapter_Activator.h
index 42237a07cf1..a5177af8b19 100644
--- a/TAO/tests/POA/FindPOA/Adapter_Activator.h
+++ b/TAO/tests/POA/FindPOA/Adapter_Activator.h
@@ -4,7 +4,7 @@
/**
* @file Adapter_Activator.h
*
- * $Id$
+ *
*/
//=============================================================================
diff --git a/TAO/tests/POA/Identity/svc.conf.xml b/TAO/tests/POA/Identity/svc.conf.xml
index 0d727d7d414..cc01622f287 100644
--- a/TAO/tests/POA/Identity/svc.conf.xml
+++ b/TAO/tests/POA/Identity/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/POA/Identity/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/tests/POA/On_Demand_Loading/svc.conf.xml b/TAO/tests/POA/On_Demand_Loading/svc.conf.xml
index 8e9e74064d9..7cfdd9fbc1e 100644
--- a/TAO/tests/POA/On_Demand_Loading/svc.conf.xml
+++ b/TAO/tests/POA/On_Demand_Loading/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./examples/POA/On_Demand_Loading/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static id="Server_Strategy_Factory" params="-ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Param_Test/svc.conf.xml b/TAO/tests/Param_Test/svc.conf.xml
index ac9bb2d96dd..befa3aeb409 100644
--- a/TAO/tests/Param_Test/svc.conf.xml
+++ b/TAO/tests/Param_Test/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Param_Test/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please read $TAO_ROOT/docs/Options.html for details. -->
<!-- -->
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
index 1c0ca44b138..f84c6801c0e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h
@@ -4,7 +4,7 @@
/**
* @file ClientORBInitializer.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTORBINITIALIZER_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
index 36e4fc7032d..3fddceaa252 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h
@@ -3,7 +3,7 @@
/**
* @file ClientRequest_Interceptor.h
*
- * $Id$
+ *
*/
//=============================================================================
#ifndef CLIENTREQUEST_INTERCEPTOR_H
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
index 066079a89c6..a093b0bafac 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h
@@ -12,7 +12,7 @@
*
* This class implements the "test" interface used in this test.
*
- * $Id$
+ *
*/
class test_i : public virtual POA_RedirectionTest::test
{
diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
index 066079a89c6..a093b0bafac 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h
@@ -12,7 +12,7 @@
*
* This class implements the "test" interface used in this test.
*
- * $Id$
+ *
*/
class test_i : public virtual POA_RedirectionTest::test
{
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
index 278601d47fc..47b56902d27 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h
@@ -13,7 +13,7 @@
*
* This class implements the "test" interface used in this test.
*
- * $Id$
+ *
*/
class test_i : public virtual POA_RTTest::test
{
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 066079a89c6..a093b0bafac 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -12,7 +12,7 @@
*
* This class implements the "test" interface used in this test.
*
- * $Id$
+ *
*/
class test_i : public virtual POA_RedirectionTest::test
{
diff --git a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Banded_Connections/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml b/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Client_Propagated/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml b/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
index f94914a38d6..ca2ecb635ea 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Client_Protocol/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Collocation/svc.conf.xml b/TAO/tests/RTCORBA/Collocation/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Collocation/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Collocation/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
index 3ee25d061f6..38491e4b6f6 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
index e0ce22dfd3d..02746b14112 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 100000">
</ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
index f94914a38d6..ca2ecb635ea 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml b/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
index 85d3bad7468..9c5b7d4acf9 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Linear_Priority/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options required for regular testing -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping linear"/>
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml
index e2b638b90a3..44549173ab7 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/RTCORBA/MT_Client_Protocol_Priority/server.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="SHMIOP_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_SHMIOP_Protocol_Factory" params="-MMAPFilePrefix server_shmiop "/>
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
index 513ed1cd083..741a9d5b6d2 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
index 59a5887e4a7..89ac8ba5155 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options required for regular testing -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml
index 87504a564ec..6a092a1cd69 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml b/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Declared/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
index fc93725bbdf..c8c62dd64bd 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_iiop.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server_iiop.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Protocol options -->
<static id="Advanced_Resource_Factory" params="-ORBProtocolFactory IIOP_Factory"/>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
index e739e797ddf..c7487a7d3b4 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server_reverse.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
index 2e857d26d6c..00b954046a2 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server_reverse_nt.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
index 38ad1bef88e..6143c2528fa 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server_shmiop.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Options for SHMIOP protocol -->
<static id="SHMIOP_Factory" params="-MMAPFilePrefix server_shmiop"/>
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
index 20812d9f07f..41217cd50e9 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from server_uiop.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Protocol options -->
<static id="Advanced_Resource_Factory" params="-ORBProtocolFactory UIOP_Factory "/>
diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
index 6f522e75855..db2f0e8b876 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
+++ b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from continuous.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Option for platforms where direct mapping doesn't work -->
<static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/>
diff --git a/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
index 311554c9baa..2203ad24712 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
+++ b/TAO/tests/RTCORBA/Thread_Pool/svc.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- No options required for regular testing -->
<!-- For real-time testing, uncomment the following line: -->
diff --git a/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml b/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml
index 17e28d20bbd..78afddd1f72 100644
--- a/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml
+++ b/TAO/tests/Smart_Proxies/Collocation/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Smart_Proxies/Collocation/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
diff --git a/TAO/tests/Smart_Proxies/On_Demand/svc.conf.xml b/TAO/tests/Smart_Proxies/On_Demand/svc.conf.xml
index eeb9a2029ed..f9863a4f7a8 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/svc.conf.xml
+++ b/TAO/tests/Smart_Proxies/On_Demand/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Smart_Proxies/On_Demand/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- Dynamically configure the smart proxy -->
<dynamic id="Smart_Test_Factory" type="Service_Object">
<initializer path="./Smart_Test_Factory" init="_make_Smart_Test_Factory" params="dummy"/>
diff --git a/TAO/tests/Strategies/advanced_svc.conf.xml b/TAO/tests/Strategies/advanced_svc.conf.xml
index 10abbe0a61e..ee388bf5e37 100644
--- a/TAO/tests/Strategies/advanced_svc.conf.xml
+++ b/TAO/tests/Strategies/advanced_svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Strategies/advanced_svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- This conf file is used to load the advanced strategies. -->
<!-- dynamic UIOP_Factory Service_Object *TAO_Strategies:_make_TAO_UIOP_Protocol_Factory () "" -->
<dynamic id="SHMIOP_Factory" type="Service_Object">
diff --git a/TAO/tests/Strategies/simple_test.idl b/TAO/tests/Strategies/simple_test.idl
index 7dd811b8ffd..508bbf04063 100644
--- a/TAO/tests/Strategies/simple_test.idl
+++ b/TAO/tests/Strategies/simple_test.idl
@@ -1,5 +1,5 @@
/*
- * $Id$
+ *
*/
interface Simple_Server
diff --git a/TAO/tests/Strategies/svc.conf.xml b/TAO/tests/Strategies/svc.conf.xml
index cebfc28bbb2..0c247adab1e 100644
--- a/TAO/tests/Strategies/svc.conf.xml
+++ b/TAO/tests/Strategies/svc.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from ./tests/Strategies/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<!-- This configuration file is used to use only the default TAO -->
<!-- strategies -->
diff --git a/TAO/tests/Time_Policy/hr_time.conf.xml b/TAO/tests/Time_Policy/hr_time.conf.xml
index 27d781c308d..8b9c12db924 100644
--- a/TAO/tests/Time_Policy/hr_time.conf.xml
+++ b/TAO/tests/Time_Policy/hr_time.conf.xml
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!-- Converted from hr_time.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<static id="Time_Policy_Manager" params="-ORBTimePolicyStrategy HR"/>
</ACE_Svc_Conf>
diff --git a/TAO/tests/Time_Policy_Custom/custom_time.conf.xml b/TAO/tests/Time_Policy_Custom/custom_time.conf.xml
index 24a070f4a3d..1107e1ac60e 100644
--- a/TAO/tests/Time_Policy_Custom/custom_time.conf.xml
+++ b/TAO/tests/Time_Policy_Custom/custom_time.conf.xml
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!-- Converted from custom_time.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
- <!-- $Id$ -->
+ <!-- -->
<dynamic id="CUSTOM_TIME_POLICY" type="Service_Object">
<initializer path="CustomTimePolicy" init="_make_Custom_Time_Policy_Strategy"/>
</dynamic>
diff --git a/TAO/utils/nsgroup/windows.conf.xml b/TAO/utils/nsgroup/windows.conf.xml
index 37af1733d3b..27161f70295 100644
--- a/TAO/utils/nsgroup/windows.conf.xml
+++ b/TAO/utils/nsgroup/windows.conf.xml
@@ -2,7 +2,7 @@
<!-- Converted from windows.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
<!-- -->
- <!-- $Id$ -->
+ <!-- -->
<!-- -->
<dynamic id="Advanced_Resource_Factory" type="Service_Object">
<initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBReactorType select_mt"/>