summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-01-07 16:12:49 +0100
commitc88815f2039e7152d735c18650c102df84d9aa36 (patch)
treea703b59c98e6739970c4f3b51396c2284c9ce12b /TAO/orbsvcs
parent0fbdabcd0a8970712cbbdef06465d061a4ec13c4 (diff)
downloadATCD-c88815f2039e7152d735c18650c102df84d9aa36.tar.gz
Removed single line Id tag
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc2
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp2
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp2
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp2
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp2
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc2
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp2
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp2
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h1
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc1
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc1
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Server.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.mpc2
-rw-r--r--TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_extern.h1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_init.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/be_produce.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_args.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_preproc.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/drv_private_ifr.h2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_visitor.cpp2
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h2
-rw-r--r--TAO/orbsvcs/IFR_Service/tao_idl.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Info.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/activator_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/locator_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Push_Handler.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp2
-rw-r--r--TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc2
-rw-r--r--TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.mpc2
-rw-r--r--TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Server.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.mpc2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service_Export.h1
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp2
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc2
-rw-r--r--TAO/orbsvcs/TAO_Service/TAO_Service.mpc2
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service.mpc2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Time_Service_Server.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Server.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.cpp2
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h1
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test.idl1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp1
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc1
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Log_Event.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h1
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc1
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc2
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/main.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc1
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway.idl2
-rw-r--r--TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/ORT.mpc2
-rw-r--r--TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Object_Factory_i.h2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h2
-rw-r--r--TAO/orbsvcs/examples/ORT/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/gateway_server.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server.idl2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/ORT/sum_server_i.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc1
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Service.cpp2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/client.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/server.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/TCP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/media_timer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/ntp-time.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/sfp.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosConcurrency.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosProperty.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTime.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTrading.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Daemon_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/esf_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/event_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/sched_event_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FTORB.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtNaming.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Options.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log_Macros.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log_Macros.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Builder.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Peer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Service.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/property_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RT_Notification.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RtecBase.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/RtecScheduler.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/sched_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/security_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel3.idl1
-rw-r--r--TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Svc_Utils.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/time_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/TimeService.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.inl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/sfp.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/svc_utils_export.h1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc2
-rw-r--r--TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_1436_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/client.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h1
-rw-r--r--TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc1
-rw-r--r--TAO/orbsvcs/tests/Bug_4080_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h2
-rw-r--r--TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.h2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Concurrency.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h1
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Complex.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Gateway.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Negation.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Schedule.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Timeout.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h1
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc1
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/UDP/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.inl2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Event_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/ectest_export.h1
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_App.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast.idl2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Airplane.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Nestea.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp1
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/manual_start/test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/server_i.h2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale/test.idl1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc1
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl2
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc1
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc1
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastLocal/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Basic.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp2
-rwxr-xr-xTAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Driver/Driver.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Timeout/sig.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Name.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/common.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/notify_test_export.h1
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/Property.mpc2
-rw-r--r--TAO/orbsvcs/tests/Property/main.cpp2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Sched/DynSched_Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched/Sched.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Callback.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc2
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc2
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/test_object.idl2
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Time/Time.mpc2
-rw-r--r--TAO/orbsvcs/tests/Time/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Exporter.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/TTest.idl2
-rw-r--r--TAO/orbsvcs/tests/Trading/Trading.mpc2
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/ttest_export.h1
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/corbaname.idl2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc2
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc1
-rw-r--r--TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc2
2029 files changed, 2 insertions, 3833 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 61c0dbcbc1a..25186770861 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, concurrency_serv, naming, utils, svc_utils {
exename = tao_cosconcurrency
InstallData_Files {
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 95c22c1a3c9..4b735e5dddc 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Daemon_Utilities.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
index c1d70b797be..e52e9a807f2 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, naming, event_serv, svc_utils, iortable, messaging_optional, portableserver {
exename = tao_cosevent
InstallData_Files {
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
index 208d82687fe..01fa8a4523c 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
index e586269cfd7..d4035549bcb 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
index 8a17a07ca08..f74c6545761 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
index 1d66e52a524..2ac224abd80 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushSupplier of Echo events.
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
index ce1e164120f..c625d77490d 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/OMG_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_skel {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
index 67a61e1786e..febe5435be6 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
index e586269cfd7..d4035549bcb 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
index 8a17a07ca08..f74c6545761 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
index e616a556368..ad2da8bb0b1 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushSupplier of Echo events.
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
index cbdbc4a21cd..1caedc76b33 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/OMG_SupplierSideEC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
index d469b7c5512..7365aa874dc 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/ConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ConsumerMain.cpp
// Main program for a TypedPushConsumer of Messenger objects.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
index 4d6ea9515a0..fb9d8f77ed3 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Implements a PushConsumer.
#include "Consumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
index 6af0ab7bc63..eb8d282ec62 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// Consumer_i.h
// Implements a TypedPushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
index bac20c4abe1..6f6cdf2f33c 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
index 3cda5041e65..66486acfb86 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/OMG_TypedEC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, event_skel {
exename = Supplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
index 8162a6bf508..12bbe67878b 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/SupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a TypedPushSupplier of Messenger objects.
#include "orbsvcs/CosTypedEventCommC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
index 92ad339261a..a401ffdd498 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Main program for a PushConsumer of Echo events.
#include "EchoEventConsumer_i.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
index dd571baada7..44d8d7f1944 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
index d1a621f3c70..a67c5f1c819 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/RTEC_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
index 16fef65a5e0..6a00490e6cf 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
index 6d693ad7f46..33d2946cabe 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
index 74545e5f7fd..718344d8d9e 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/RTEC_Federated.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
index d3a202ba988..e3131db4457 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
index f166a3d1257..bc04b0e8996 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
index 70271836d2e..45ddebdb3a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
index d1a621f3c70..a67c5f1c819 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/RTEC_Filter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): namingexe, rteventexe, {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 1f8e78e255b..e06fb21e21f 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 083875fe173..7bfaecabd91 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 4e846e79f47..7145170da7a 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index ad28a202bd2..18dd4175aff 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
index 06d39ff04bd..42d2e35ece2 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index 9f3dd500486..373818b574d 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*_Dev_Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
includes += ../common
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
index 44433fb5a00..3bbccdf1b26 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.cpp
#include "SimpleAddressServer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
index 9c346d87a81..d5ba0c603a1 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.h
#ifndef SIMPLEADDRESSSERVER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
index 133bfec7d4f..b4354fd7d1a 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/ImplRepo_Basic.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
index f02608af6f5..2c75f1cb614 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger {
boolean send_message (in string user_name, in string subject, inout string message);
};
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
index 8d54b9f04cb..e6d23ec302e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
index dd032f72d3a..c3b588acd63 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <fstream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
index 0e1e7d1793b..c224376be09 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
#include <exception>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
index d129ac6800a..af61f133d87 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
index b1dd624d3b4..61b13116ae6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/ImplRepo_IORTable.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, anytypecode {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
index f02608af6f5..2c75f1cb614 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger {
boolean send_message (in string user_name, in string subject, inout string message);
};
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
index 7659b23a2cd..548cfa93d47 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/SString.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
index f97b43da4da..b86312d4220 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "tao/PortableServer/Root_POA.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
index 401d9a7cd1c..fce3618c8ce 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
index 10f376d0ed0..50d880249f6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
index 6526e159b7e..62ab0ba3355 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/ImplRepo.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
index b761ffd2b29..b171436a7b4 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
index 4a6a52b9b75..6a7363d408e 100644
--- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MessengerServer.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
index 944aef0f190..d2bda4bf1bc 100644
--- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/IFRBrowser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//
// IFRBrowser.cpp
//
diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
index 8ac11a758fb..81dfc6c5dbe 100644
--- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
+++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module warehouse
{
interface inventory
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
index 815d5d11285..53654da5596 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(NamingService*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
index d5c8320b9a3..085eacdf119 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
index 72c893f917c..065531c70e3 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
index 449d57cd576..e5e55c56cfa 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
index 2931c9af9c6..12c13e00231 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/Naming_Client.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
index eb1baab211b..b3c61b6b158 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
index 11a86fe736f..9436c6ad8e6 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Naming_Context_Ext.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
index e43f2776d0b..9a758e812a6 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerTask.h"
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
index bc5cdebca15..2c3242589d4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERTASK_H
#define MESSENGERTASK_H
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
index dda5b2b6a36..d4b43f49e53 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "MessengerTask.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
index 6f2c99971e9..8f84e2918a8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
index 647b32f0a8f..4b5cbba13e7 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
index 6a91c764766..225dcbfea04 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Naming_Server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Messenger): namingexe, naming_serv {
requires += threads
}
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
index 01bea71a6f0..71268a4c3ad 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
index a9c67a032b0..4176d24f881 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/corbaloc_Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
index 0af8b9e9c0f..aaedd932648 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
index 9c8104ebaa5..fe30be3471b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
index 736549ca88f..7707a444aa1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
index 8c8612d4943..9d51410908b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/corbaname_Messenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
index ed0b14b832b..7a35c676210 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
index 90be87592af..6d05f65ede8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventSequenceConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
index e8bdfef2775..bccc18fa496 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
index 4bd0dee0204..c47f465d145 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventSequenceSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
index 3a5a153a42e..0916ff71c5e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
index c7e25db57d8..54ab8dac3e0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
{
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
index e2ef6e68a4b..8d00caeea38 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
index 251383637b2..f5761a14769 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
index ad055da144b..54a3ec2ab39 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index 9d3dadaa1a5..ddc2a0b93ee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
index 949f5c87dc6..d05f869ca23 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
index 67245745272..6420601b781 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
index 657fea8c323..be6ae506933 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
index 8d52a5af557..ee8f68f6e63 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
index 89fdc1f0544..ce7ed668126 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
index 458d1746892..8938018d98d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
index f63bc493769..10a9e283676 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
index 087c07b3aba..4327f7e112f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
index bcf2f8ceeaf..28e2fb05627 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
index 2cee3e77fd8..a7c4c008e31 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
index 4d086d17e7e..a8331596d84 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
index 9f18951c030..64846510eea 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
index 789bd3b575f..f9642e73f00 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
index 6bbee91521d..b596d076974 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
index 1fd41b6459e..8728eb776c4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
index a2831e16f0f..bdbdc2eb77a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
index 38fa49c29e9..2d9c4182adb 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
index adb5bd999c8..caa915228d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index 18fd224aa8e..b11df7abb34 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
index 6df2455fcb0..6921775d62e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
index cf6f2cec87c..0208d26fc7f 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
index 1c886f4552c..e5024d5c00a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
index 7e335ee5ed3..ad834dd609c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
index 22b66bac034..d9fb63f56d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
index 401201354b4..9ccdbcc3740 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
index 684122ac49f..a1c11e2cc82 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
index 86c10e74910..0f4a599cd41 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
index e6cf9911d12..0c3cf2b94d5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
index aac055fad6c..4390df96b8d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
index 9593e561210..57435039d6a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
index 55c7936e0e6..a7ef3d0a956 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
index 7ab9090a365..8f3e9b62eec 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
index a1b646d43c6..f053d4af659 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
index 38fa49c29e9..2d9c4182adb 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
index 5ebf8e8911a..60f4e998169 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
index 567e8e1a57c..69d59d6dbf0 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
index 18fd224aa8e..b11df7abb34 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
index 01fad5fb2d0..e6999f98ee5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
index e2b13b5a3e4..df3027a9c49 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
index 789bd3b575f..f9642e73f00 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
index 0b7adaf87a7..ca7a74bb15a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
index 1fd41b6459e..8728eb776c4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
index 92fdf82fd13..d269451a068 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
index 9eb0591df2e..83115d8465c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
index 8fd79a67cb8..fb667d54f9c 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _PRIORITIES_H_
#define _PRIORITIES_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
index 2915af028d6..b662bc653b8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
index 74c54474e14..e80efb54cee 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
index adb5bd999c8..caa915228d8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
index 0747d830bbf..263b4d03d66 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
index 6df2455fcb0..6921775d62e 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
index a3bd8c12943..2ad676a6cc5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
index 5d3cb836453..56bb0b9cae4 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "MessengerC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
index b1465b88b3f..04368337c92 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
index 58b72ff1f41..14e332e2672 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
index 8abe0871b55..27eba7e188a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Profile_Timer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 5b5f93e2167..2def116b05a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
index 15471aaedde..28e15e9d4f9 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
index 7f4d6bc3524..b3d363c0d52 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
index 6dd45e0b20c..c4447b4aaaa 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
index 0bd7c8a5ccb..8cf0e0abd35 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
index 37d97731643..175802a164b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
index c6782f26005..0ecc4d6e97d 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
index 08c2c95625a..26400a9741a 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInitializer.h"
#include "ClientInterceptor.h"
#include "MessengerC.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
index 1bd687a032f..4870f1877c3 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINITIALIZER_H
#define CLIENTINITIALIZER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 0133711c16a..6bdd7c6a1de 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientInterceptor.h"
#include "tao/OctetSeqC.h"
#include "tao/PI/ClientRequestInfo.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
index 15b0129df95..f3ec546e4b4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CLIENTINTERCEPTOR_H
#define CLIENTINTERCEPTOR_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
index 4474bcc36f9..ceda3e3e52b 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
index af4307307eb..7376b2e1281 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ClientInitializer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
index 3ee2f4c0965..f920ab4198a 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "MessengerS.h"
#include "ServerInitializer.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
index 3b5134a0f34..a1123ce09e9 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/PICurrent_NameService.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
index 95cb35a442e..c4ac773fcc4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInitializer.h"
#include "ServerInterceptor.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
index bb8a55b1b8a..fb880e8b5f4 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINITIALIZER_H
#define SERVERINITIALIZER_H
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
index 18367d88c3e..7b4bef43561 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerInterceptor.h"
#include "tao/PI_Server/ServerRequestInfoA.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
index ca4732c5075..a8da1affe95 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVERINTERCEPTOR_H
#define SERVERINTERCEPTOR_H
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
index 128524db35d..02aff8b734a 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/LongSeq.pidl"
valuetype MyEvent
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
index c2cb67e1f49..c47878eb0fc 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Event_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef EVENT_H_
#define EVENT_H_
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
index ac56f4b75f4..329f3d5f8bb 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/Notify.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*supplier) : taoexe, portableserver, valuetype, notify, portableserver, event_skel {
exename = supplier
source_files {
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index 87918070ec3..ac2684ce17d 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This supplier requires that the Notify_Service is started with
// -IOROutput notify.ior -channel -nonamesvc
// at minimum.
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
index f4996d63f1e..a443e406eb6 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This supplier requires that the Notify_Service is started with
// -IOROutput notify.ior -channel -nonamesvc
// at minimum.
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index ae380b50111..796b2156377 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Sched_Params.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
index ba972852924..62a75e255f5 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver {
exename = tao_dump_schedule
}
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index fd392a917fd..29726be0784 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Service.h"
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc
index 25e20564bef..c4a4d2db2f6 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.mpc
+++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop, svc_utils {
exename = tao_rtevent
}
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
index 4b6c9608d08..5272cfc9150 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRT_Event_Service): orbsvcsexe, utils, rtschedevent, ftrteventchannel, ftorbutils, install {
exename = ftrt_eventservice
includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 348061a30c7..389059de415 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_EventService.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 22766f6b718..2c4ee830c36 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "EventChannelFactory_i.h"
#include "ace/Process.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index fd86aeed1c4..3d1fb378775 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "EventChannelFactory_i.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index 22990c1de45..6f3cc7119e0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notification, event_skel, strategies, install, svc_utils {
after += FaultTolerance
exename = ftrtec_factory_service
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index af5a753136a..60e94824d93 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/SString.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
index 776ae50a998..72804950e55 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient, strategies, install {
exename = ftrtec_gateway_service
includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
index befc6b319ac..1fc693a4ea8 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "FT_Naming_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
index bb8f2820b48..9ebeba5d3dc 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_Naming_Service.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h"
#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
index a0d546fa73a..6fd6bb03905 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, imr_client, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = tao_ft_naming
Header_Files {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 75d1a7a6218..aa4dcccaf3c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_Property_Validator.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "orbsvcs/FT_ReplicationManagerC.h"
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index 4fc203b9cdd..8e72e8939ff 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Lib): orbsvcslib, orbsvcs_output, conv_lib, fault_tolerance, notification_skel, ftorb, portablegroup, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, install, svc_utils {
sharedname = TAO_ReplicationManagerLib
dynamicflags += TAO_REPLICATIONMANAGERLIB_BUILD_DLL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
index b6a46c4cf8e..4cef9dc97cd 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_ReplicationManagerLib
// ------------------------------
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
index a530e7f7890..99f9623a49c 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : taoserver, orbsvcsexe, install, fault_tolerance, svc_utils {
exename = tao_fault_detector
Source_Files {
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index 41619023419..068c136fc84 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,4 +1,3 @@
-// $Id$
project : taoserver, orbsvcsexe, install, fault_tolerance, notification_serv {
exename = tao_fault_notifier
Source_Files {
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index c8ab2234b8f..c7a6dba46c3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "IFR_Service.h"
#include "tao/Environment.h"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index f0555f0b4f9..d51d3ad101b 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "IFR_Service.h"
#include "orbsvcs/IFRService/ComponentRepository_i.h"
#include "orbsvcs/IFRService/Options.h"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index d04d4fe4613..ffa5967da2f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
// The ifrservice base project inherits from minimum_corba, so it's no longer
// necessary to add minimum_corba to 'avoids' here.
project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client, svc_utils {
diff --git a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
index 3ae082aa61e..86c88699253 100644
--- a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
+++ b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h
index 4961b84387e..220a1ae7c44 100644
--- a/TAO/orbsvcs/IFR_Service/be_extern.h
+++ b/TAO/orbsvcs/IFR_Service/be_extern.h
@@ -1,5 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 72d33de3371..94916420226 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "global_extern.h"
#include "be_extern.h"
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 52e313254e0..79b85bd6728 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_args.cpp b/TAO/orbsvcs/IFR_Service/drv_args.cpp
index d7f5a0951ff..ffca5814d63 100644
--- a/TAO/orbsvcs/IFR_Service/drv_args.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_args.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
index 0e653bc1ed1..3012c700d76 100644
--- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
index a277283542d..4f4a4cd0840 100644
--- a/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_preproc.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
index b5ff1ba822e..293564a0d33 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
index 97b66d7c7e1..a6a44aceb27 100644
--- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
+++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h
@@ -1,5 +1,3 @@
-// $Id$
-
/*
COPYRIGHT
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 6c6adccf89b..e708a400ccf 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_argument.h"
#include "ast_array.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 328b638b06f..085e7f1d617 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_exception.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index b5703032394..368763cd70b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_argument.h"
#include "ast_exception.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 0c53a5bc7e2..b2ef423353d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_expression.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index a03bf8a5845..0ef2385edad 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ast_enum.h"
#include "ast_expression.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index c671f048e98..8c9c04bb1e8 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ifr_removing_visitor.h"
#include "utl_scope.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index c349825d1d7..2aad7a8ff2d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -1,6 +1,4 @@
/* -*- c++ -*- */
-// $Id$
-
#include "ifr_visitor.h"
#include "ace/Lock_Adapter_T.h"
#include "ace/Synch_Traits.h"
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
index 46e38822075..6df2ecee70c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_IFR_VISITOR_MACRO_H
#define TAO_IFR_VISITOR_MACRO_H
diff --git a/TAO/orbsvcs/IFR_Service/tao_idl.cpp b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
index 90a26b11e50..d2db359f154 100644
--- a/TAO/orbsvcs/IFR_Service/tao_idl.cpp
+++ b/TAO/orbsvcs/IFR_Service/tao_idl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// This file is here to avoid the use of VPATH. Since the TAO_IDL
// counterparts are built with a different BE_GlobalData definition, the
// object files built in the TAO_IDL directory are not usable in the
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
index 76cf3adb984..4633fa0dfcf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Activator_Info.h"
Activator_Info::Activator_Info (void)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
index c9d4d40b0a7..704e489a354 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Info.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ACTIVATOR_INFO_H
#define ACTIVATOR_INFO_H
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 17114c0d580..2023bcad320 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Activator_Loader.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index f0b42a0cf9f..0b1f2231651 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "AsyncAccessManager.h"
#include "ImR_Locator_i.h"
#include "Locator_Repository.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
index 36ed0e3ba1a..8ebeff1cc95 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "AsyncListManager.h"
#include "Iterator.h"
#include "Locator_Repository.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
index bb633f2851c..19a5712e239 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Config_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index c7f62fe55f4..af123997f1a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Activator_Options.h"
#include "ImR_Activator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
index cb60e0851e8..b636f001ac2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
@@ -1,7 +1,5 @@
// -*- IDL -*-
-// $Id$
-
#include "ImplRepo.idl"
module ImplementationRepository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 10f043d5dd5..8230a7956ec 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Activator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 0793a13aad8..8bdf98001ea 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Locator_i.h"
#include "Locator_NT_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
index a7577b44a18..004622ec009 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
@@ -1,6 +1,4 @@
// -*- IDL -*-
-// $Id$
-
#include "ImR_Activator.idl"
module ImplementationRepository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index a3cb9866759..1ed12186226 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ImR_Locator_i.h"
#include "utils.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index c9ff837871b..ceae08cde08 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef IMR_LOCATOR_I_H
#define IMR_LOCATOR_I_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 1380a0a9df7..ee11052249e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(Async_ImR_Client_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults {
sharedname = TAO_Async_ImR_Client_IDL
dynamicflags += ASYNC_IMR_CLIENT_BUILD_DLL
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 3ec2ffc78ee..8cc68ded334 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "LiveCheck.h"
#include "ImR_Locator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index c4f8ed397ab..4328605dad5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Loader.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 30e968b63ef..995b6fb5aad 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Repository.h"
#include "ImR_Locator_i.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index 653c8c09e07..723fc6a14f4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Locator_XMLHandler.h"
#include "XML_Backing_Store.h"
#include "utils.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index e3b2f8bc151..a8e19c37695 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Info.h"
Server_Info::Server_Info (void)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index bbd03927044..f5a0f183880 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Shared_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
index dc49b29f154..d59ca87d08e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Locator_Repository.h"
#include "UpdateableServerInfo.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
index bc41418eb94..17977954411 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "XML_Backing_Store.h"
#include "Server_Info.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/activator_export.h b/TAO/orbsvcs/ImplRepo_Service/activator_export.h
index fcd22f8ccde..b434dbc2046 100644
--- a/TAO/orbsvcs/ImplRepo_Service/activator_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/activator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Activator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h b/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
index 5ae5cbc5e22..6dd31ac83ce 100644
--- a/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/activator_idl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Activator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
index a19163be766..f39f1cfe3fe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/async_imr_client_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl Async_IMR_Client
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/locator_export.h b/TAO/orbsvcs/ImplRepo_Service/locator_export.h
index 8a3584386f1..3b194462894 100644
--- a/TAO/orbsvcs/ImplRepo_Service/locator_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/locator_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Locator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h b/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
index 3016cfc767b..0f111fa3979 100644
--- a/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
+++ b/TAO/orbsvcs/ImplRepo_Service/locator_idl_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s Locator
// ------------------------------
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
index 45b72a2790a..2ef1d70b5ab 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "tao_imr_i.h"
int
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 9503b0b3da3..5eddf46cd03 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "tao_imr_i.h"
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 82dac4d7097..0a6eecbe417 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, lifecycle_skel, naming, trading_serv, avoids_minimum_corba, utils, install {
exename = tao_coslifecycle
}
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index 116bc02d955..85fb39b8d56 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Signal_Handler.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index 2f1989c1c6d..6cbeb210467 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Push_Handler.h"
#include "Monitor_Signal_Handler.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index ff0cf22f531..05ca0743fa3 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Monitor_Signal_Handler.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
index b1883c310b7..350101d7f79 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Push_Handler.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index c960ae4db9d..bd4eca32960 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Signal_Handler.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index ee4ab3dec80..58e5ffad727 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Basic_Logging_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 58d7c1b8cc1..d8094afeb0c 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Basic_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
index 5afb55a219c..fcc9dad1dea 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dslogadmin_serv, valuetype {
exename = tao_tls_basic
InstallData_Files {
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index cf87be5880e..2bb30aa6cb5 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Logging_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index d78635182df..3a12a0d0a5d 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Event_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
index b334a0094ba..03bb8464465 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dseventlogadmin_serv, valuetype {
exename = tao_tls_event
}
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 8aa660e1b17..09df44ccbbf 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Logging_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
index c13b36fb8aa..0babac76263 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, dsnotifylogadmin_serv, valuetype {
exename = tao_tls_notify
}
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index 35bec988776..0be23190c34 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "RTEvent_Logging_Service.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index e3bd76826e6..c2c6b65e1de 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "RTEvent_Logging_Service.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
index 99d165afa7e..a37690ec240 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project: namingexe, iortable, install, rteventlogadmin_serv, valuetype {
exename = tao_tls_rtevent
}
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index e23c4c968b5..c2adf6a50d9 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#include /**/ "NT_Naming_Service.h"
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 2829fe15b73..b649ea80844 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Naming_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 02f78e527f4..8bf80ec3966 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Naming_Service.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 1aee8f17aca..cb892d62c16 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
exename = tao_cosnaming
Source_Files {
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 846624a536a..a561076517f 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include /**/ "NT_Notify_Service.h"
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index a3a5ce79133..6a0394be9aa 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Service.h"
#include "orbsvcs/orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 2e5a38437ef..e9118f0a875 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Notify_Service.h"
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index d23dd40674b..993fac76d8e 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, orbsvcsexe, install, notification_serv, naming, iortable, messaging_optional, svc_utils, notify_monitor_control {
sharedname = TAO_Notify_Service
dynamicflags += TAO_NOTIFY_SERVICE_BUILD_DLL
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h b/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
index 006cd9112c9..95946ed4d29 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 8a70f9bfb5f..90e27bb45ef 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Scheduling_Service.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
index 9d3a4a959c1..3b5be0f1150 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, install, rtsched, naming, svc_utils, iortable, portableserver, utils {
exename = tao_cosscheduling
}
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
index 6dc278a02a1..b1f2f515f7f 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : taoexe, install, svc_utils {
exename = tao_service
}
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 50d75e2fbcc..d0eb5acb343 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Clerk_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index ea2454aad2b..bed1e69b2c3 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Server_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 5a984c18ae2..94303738196 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Time_Service_Server) : orbsvcsexe, install, time_serv, naming, utils, avoids_corba_e_micro {
exename = tao_costime_server
Source_Files {
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index af9a3d18e66..dcd98386e8e 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Clerk_i.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index a80dc435991..5adc3578fb1 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Server_i.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index e0067cc60db..10fa4ba2c46 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "Trading_Service.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index f604cdffdc2..16e00596670 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Arg_Shifter.h"
#include "Trading_Service.h"
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index e6f950ecad2..3bc4eded25a 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, utils, install, naming, trading_serv {
exename = tao_costrading
InstallData_Files {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index 2ff7ecdb1d7..8577f90b070 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : orbsvcslib {
IDL_Files {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 6bcd6c8d280..718240449ca 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEventChannelFactory_i.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index da07a2dd6f8..8d725db9608 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEventChannelFactoryC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index a2e11f0c2de..fcee32c9c77 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FactoryDriver.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
index 0e342ef78dd..d55389dbb0c 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "FactoryDriver.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
index 4b9dcc1bf4b..2a5e66c6c4f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, event_skel, naming {
after += CosEC_RtEC_Based_lib
exename = RtEC_Based_CosEC
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index d9134d65ee8..7c9e7e02414 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RtEC_Based_CosEC.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index eb7a53782f0..6dbebc8de06 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ConsumerAdmin_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
index c0db68febea..90a04d18efd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosEC_RtEC_Based_lib) : orbsvcslib, event_skel, rtevent_serv {
sharedname = CosEC_RtEC_Based
dynamicflags += TAO_RTEC_COSEC_BUILD_DLL
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 5511ff6ae54..94fcde603e3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "CosEvent_Utilities.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index 75fd15400db..fac4613996d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "EventChannel_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 2301272e0b6..72850567d31 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/CosEventChannelAdminC.h"
#include "orbsvcs/CosEventChannelAdminS.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 958e10373ad..0c3e1c89033 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
//
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/CosEventChannelAdminC.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 66800d52839..ba277070aa2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SupplierAdmin_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
index 4d2cbe378d2..080e7ee2a28 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/rtec_cosec_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 45711a26bfb..959aa21e667 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Basic.h"
#include "CosEvent_Utilities.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 7a9073af784..435888329b5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Consumer.h"
void
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
index 3ab573641e8..939e4d81b59 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : orbsvcsexe, event, event_skel, rtevent_serv, rtsched {
after += CosEC_RtEC_Based_lib
exename = Basic
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 4495a9bdd82..0a5b0f9bb35 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Supplier.h"
void
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 1656ddd70e2..c0f1633dd9e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Consumer.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index dc533656fb5..83b383e0026 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
after += CosEC_RtEC_Based_lib
exename = Consumer
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 3093afb565f..bf465408a0e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Multiple.h"
Multiple::Multiple (void)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 3bb98542efa..66dd5961a01 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "Supplier.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index a622faa18d7..adedd3b2be3 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
index 9537776ef03..cf285141110 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Service) : orbsvcsexe, event, event_serv, naming {
exename = Service
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 324f5729357..1e8c46938e5 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 49d8c91f572..b23bcc5216e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index e1817ebd6e2..d7d41e6a634 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/CosTypedEventChannelAdminC.h"
#include "Country_i.h"
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
index 22056c72cb8..53585416aa2 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming {
exename = Consumer
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
index e4895d84c90..bd3dde4f6b7 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
@@ -1,5 +1,3 @@
-// $Id$
-
//IDL
#ifndef TAO_COUNTRY_IDL
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index aea93327e95..4a6b0e23017 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/CosTypedEventChannelAdminC.h"
#include "CountryC.h"
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index fbe3fb40a82..ec4c10d56e3 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
RolyPoly.idl
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
index e3dcb36c9a1..0de27980f0d 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*IDL): taoidldefaults {
idl_files {
service_config.idl
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 889e23c95c2..995ef08cb47 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple example, showing how you can load an
// ImR Locator and/or Activator as ACE Service Objects
// using the ACE Service Configurator framework.
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index 9bf463931ca..90ae5930611 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
#include "service_configC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index b6926fa148c..048c040e03b 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "dynserver.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index 94705cc7009..2cf2373b242 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DYNSERVER_H
#define DYNSERVER_H
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
index 459e4532891..32e36ea09c9 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s DynServer
// ------------------------------
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl b/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
index f4fb3363f8e..5e3226c5ffa 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/service_config.idl
@@ -1,4 +1,3 @@
-// $Id$
// Just provides a corba interface to the ACE Service Configurator
interface ServiceConfigurator {
long process_directive(in string s);
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 71186f3df88..985e5be1557 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
#include "testC.h"
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl b/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
index 9ff40e9c6a9..9f1dcab2358 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface test {
long get();
};
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index 8b37a4c981c..e890ce2cc25 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
// It uses multicast to find the ImplRepoService
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index adb5efc8778..3b5c704863e 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl) : taoidldefaults, anytypecode {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index ce75f2fc99d..07824aa8bc2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 546ec30fd68..041ddf9fbd8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RPS_Monitor.h"
#include "ServerRequestInterceptor.h"
#include "ace/UUID.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 9acee119ccd..2af202455c5 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerRequestInterceptor.h"
ServerRequestInterceptor::ServerRequestInterceptor (void)
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 3e8714ab864..dc9a42c1638 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 1ba89fe6b44..49c00ddf9f2 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORBInitializer_Registry.h"
#include "StockFactory.h"
#include "ORBInitializer.h"
diff --git a/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
index 73476b098d4..fa59fccccff 100644
--- a/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
+++ b/TAO/orbsvcs/examples/Log/Basic/Log_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : orbsvcsexe, dslogadmin, naming {
exename = client
}
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 291d307e3e5..4902f70300f 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TLS_Client.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index fa9b4071031..f5fc7a9abe4 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TLS_Client.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index ce79fea9762..13b7f0b318e 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index e3e738174a8..80d40ebf367 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Event_Supplier.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
index c96507ed65c..73b94cc0d1d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
+++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming {
exename = Event_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
index 9082517a64c..62cb293b63d 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
+++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming {
exename = Notify_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 7eb34e19523..72636dce089 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Consumer.h"
#include "orbsvcs/CosEventChannelAdminS.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 637faeeea69..7040112fe63 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Supplier.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
index 83fed7aa672..b25dd200ea2 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Log_RTEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, rtevent_skel, naming, rteventlogadmin {
exename = RTEvent_Consumer
source_files {
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index dbb42d94488..8dbbc806d8e 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RTEvent_Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 5e77fc75820..b7e4f09ed25 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RTEvent_Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index 59ac860eed4..3d685ad9d1b 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv, typecodefactory {
exename = agent
after += Gate
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
index c813c802bc0..79a075f6484 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by
// generate_export_file.pl
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index 0d4cef2fab4..7055c096e6f 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -1,6 +1,4 @@
// author : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// $Id$
-
#include "Gate.h"
#include "ace/Truncate.h"
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
index f42ab5cc070..936e3a5b81c 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Gate) : rmcast, orbsvcsexe, notification, notification_skel {
sharedname = Gate
dynamicflags += GATE_BUILD_DLL
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index 5a09b937495..29ab07c63eb 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv, typecodefactory {
exename = craft
after += Gate
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
index 8918e07c037..a4556ce5fd4 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
+++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, notification, notification_skel, naming {
exename = Filter
}
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 8d2ef0f19c7..f1254a3e181 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 37aea1702ba..243b53b8b11 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
TAO_Notify_Lanes_Consumer::TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects)
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 8697daeebd0..285db7c8a01 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Client.h"
#include "Consumer.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
index 072ed502b10..face8092307 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Supplier): rtcorba, rtnotify, avoids_minimum_corba, naming {
exename = Supplier
Source_Files {
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index 43f68e43eaa..687fa6053ea 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Objects.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index f2344182273..d27314e6c6b 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index f453c3944e2..1dd31a372c0 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 85245d221e3..096b868623c 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_Client.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
index 905afdd88ce..49e6acd9873 100644
--- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
+++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_ctype.h"
diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
index d32506ad621..9b38b2c9752 100644
--- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
+++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc
@@ -1,4 +1,3 @@
-// $Id$
project (mc_monitor_example): notification_mc {
exename = monitor
}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
index da737f5f444..f5affa664ef 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, notification, notification_skel, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Subscribe
}
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index dbd64e04255..44a0a8e9523 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Subscribe.h"
int
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index d6f2f7f753e..3b0eca92ddd 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 0a72f5c06fe..d34251bb9b7 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer_Client.h"
#include "Consumer.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
index 94733de0d48..03710e2a00f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Supplier): rtnotify, notifytest, rtportableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Supplier
libpaths += ../../../tests/Notify/lib
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index 43f68e43eaa..687fa6053ea 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Objects.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index f2344182273..d27314e6c6b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index 6335c57ec00..8defbca6e3b 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 26e6d38c16f..faf55063b65 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier_Client.h"
#include "ORB_Run_Task.h"
diff --git a/TAO/orbsvcs/examples/ORT/Gateway.idl b/TAO/orbsvcs/examples/ORT/Gateway.idl
index f9b62e41070..e69ea1b2985 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway.idl
+++ b/TAO/orbsvcs/examples/ORT/Gateway.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef GATEWAY_IDL
#define GATEWAY_IDL
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index dcb26d34621..d313390481f 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_ObjRef_Factory.h"
Gateway_ObjRef_Factory::
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 3845804c8bd..82ee26dc2f2 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
idl_files {
Gateway.idl
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index ae4ac1dd5ae..867dc575e85 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Object_Factory_i.h"
#include "tao/PortableServer/Root_POA.h"
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index 15762a58d6e..80aaf03d774 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file Object_Factory_i.h
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index e3fd27b471c..49a2906ce81 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_IORInterceptor.h"
#include "Gateway_ObjRef_Factory.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 005396f8a49..dd9dbd2940d 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_IORInterceptor_ORBInitializer.h"
#include "Server_IORInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 6ea98e2fab8..1832257174a 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef SERVER_IOR_INTERCEPTOR_ORB_INITIALIZER_H
#define SERVER_IOR_INTERCEPTOR_ORB_INITIALIZER_H
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 679a8918339..ef121f69179 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "sum_serverC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index 66d9125c040..49d07e9d9de 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Object_Factory_i.h"
#include "Gateway_i.h"
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 743c38fc37a..63689117a76 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sum_server_i.h"
#include "Server_IORInterceptor_ORBInitializer.h"
#include "tao/ORBInitializer_Registry.h"
diff --git a/TAO/orbsvcs/examples/ORT/sum_server.idl b/TAO/orbsvcs/examples/ORT/sum_server.idl
index fdbf0b2a740..fe837b5bf51 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server.idl
+++ b/TAO/orbsvcs/examples/ORT/sum_server.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module ORT
{
interface sum_server
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 25d3ee8dfd1..8ffe8517660 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sum_server_i.h"
sum_server_i::sum_server_i ()
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index 1d3101e97bf..730542b0aa4 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
//=============================================================================
/**
* @file sum_server_i.h
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index d0994c95d3d..a91010fce32 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index 686b1110fa3..46beee50311 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 39bda637a4c..1e5908baf66 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
index 281f4775ed1..f241d1f4851 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer): messaging, rteventexe, naming {
exename = Consumer
Source_Files {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index b5fa6558f6a..71007b6620f 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 72ddfc327d6..6affe0ce442 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
index 79b652f0621..0439a997990 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: orbsvcsexe, rtkokyuevent, rtevent_serv {
exename = Service
}
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 9faab51f969..d5294b91bec 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Reconfig_Scheduler.h"
#include "orbsvcs/Runtime_Scheduler.h"
//#include "orbsvcs/Event/Module_Factory.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 69cadbb56ce..bebbcd0bf16 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 4c2f53f1b4f..2614ed8708f 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AddrServer.h"
AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index 69b98c3b552..0fca147dffc 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 90e95851b3e..3028d6a29d8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "Supplier.h"
#include "AddrServer.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
index ec419f3bb13..bfb930f15dd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
+++ b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, rtsched {
exename = MCast
}
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 5ec77c0b47f..819a6caf61a 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4588a48aef8..4554ad6baff 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
Consumer::Consumer (void)
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
index f28dd9330a4..4ef22d036b1 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, rtevent_serv, rtsched {
exename = Service
}
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
index 5f4119984e8..83254f72da2 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 6f06d98c581..09820b9d704 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Reconfig_Scheduler.h"
#include "orbsvcs/Runtime_Scheduler.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index ae4549a37b8..3a97402ca8e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
Supplier::Supplier (void)
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index 1edc1f633e3..59afb5c30f0 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
index 0982c19dbc0..adfb9d53a47 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
+++ b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Service) : orbsvcsexe, rtevent_serv, naming {
exename = Service
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index d941b8eb05f..b6132709bef 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 589dfbbcd90..9c7b5324b23 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 759335e549f..50bb40a03a0 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_Test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 47d992673fc..66f5acd3b42 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_TestC.h"
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index d40c741f314..a644b0db7cb 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SLevel1_Test_i.h"
const ACE_TCHAR *ior_output_file = 0;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
index 2d368b64b38..df921283397 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
+++ b/TAO/orbsvcs/examples/Security/Send_File/Security_Send_File.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Idl) : taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 43137bf8ab8..ab977303ded 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 48da3015992..0a1794867fe 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 5137d42bc91..e86fd97902c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.inl b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 3a3477f4d4d..bedc9ee8129 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(AV) : orbsvcslib, orbsvcs_output, install, property_serv, naming, qos, tao_versioning_idl_defaults, svc_utils {
avoids += ace_for_tao
sharedname = TAO_AV
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index ec1d5a1320f..5c6b24a29bc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/AV_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_export.h b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
index bfabf3dcde8..62afaf7464d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_export.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index fc424893e16..bbe3cfc9108 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP
#define TAO_AV_ENDPOINT_STRATEGY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
index 26da6188ebb..f0b511711d2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/Fill_ACE_QoS.h"
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 2dabe381e62..7abe7aa92d8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//------------------------------------------------------------
// TAO_FlowSpec_Entry
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index dbe20c5849c..6aca9ffafce 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/MCast.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index 32fec051712..a5b375deb70 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/FlowSpec_Entry.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index a93b2545c49..e111b85e604 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 34acc9c7196..ef83a1898ac 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/QoS_UDP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 6b7a2376bf4..084d1fc8421 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -32,7 +32,6 @@
* SUCH DAMAGE.
*/
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/ntp-time.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
index a1bb326b1ab..63fcc7c4899 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTCP_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index 5a5ea72523a..a60df3084ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef RTCP_CHANNEL_INCLUDE
#define RTCP_CHANNEL_INCLUDE
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 9bdc89cf7a6..c2a0fa5b5c1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTCP_Packet.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 696378258af..4fe56cc5b30 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef RTCP_PACKET_INCLUDE
#define RTCP_PACKET_INCLUDE
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 6b41e6b2e53..a7378a76974 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -32,8 +32,6 @@
* SUCH DAMAGE.
*/
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/RTP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
index 68d97fb7735..d70ef01bb09 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/SCTP_SEQ.h"
#if defined (ACE_HAS_SCTP)
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index b6e0ef0cdf3..b0b10f58da8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/TCP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 6403b9dc602..909d9eb5657 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index a1676add764..601e173fdfc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/UDP.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index 1e72b0acac9..19ec09132b9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/default_resource.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
index e6a32956169..60eeb6ad7e2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
/*
* Copyright (c) 1995 Regents of the University of California.
* All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index 6df31d6cf67..17bea11966b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
/*
* Copyright (c) 1995 The Regents of the University of California.
* All rights reserved.
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index cf517dc3b5e..20067f9e90e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/AV/sfp.h"
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 308bcd713f7..cc2cd295b79 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef ACE_CHANNEL_CLIENTS_T_CPP
#define ACE_CHANNEL_CLIENTS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 606a8cbae3a..997efb34aca 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = LIBRARY
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index 64b0c672e3a..0056beb1e52 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// LIBRARY
// libTAO_CosConcurrency.so
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 4482671e3db..db4f396520d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// Concurrency_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
index 4406ec2e93f..f105e241ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
index fe99ece77aa..72c35e31de0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
index 5894da8e9de..730f9e841f4 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index d4120c81e06..50aad490694 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosConcurrency_IDL): orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Concurrency_Export -Wb,stub_export_include=orbsvcs/Concurrency/concurrency_export.h -Wb,skel_export_macro=TAO_Concurrency_Skel_Export -Wb,skel_export_include=orbsvcs/Concurrency/concurrency_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 97b0de957d9..e99cace9d56 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (CosEvent_IDL) : orbsvcslib, orbsvcs_output, install, avoids_minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -GT -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 0ad34e15760..cfd92db0be4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 6740acf67da..cc9fab516c4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 7780681aaf0..6ecde1dd993 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index ac830526779..a72aa1280ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 27f5e1c37d8..b46ef5986cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index a17ed20d9d1..4692f5f8790 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
//=============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 9dc4b6b2f19..63b3407fecf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index fb424d87009..deda68038c8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//==========================================================================
// LIBRARY
// libTAO_CosEvent.so
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index eeb89d93f1b..50fe4fd1094 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 79926396970..1b12a134671 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 3c26d56fa2e..625fade23c1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index fadaf6c2bea..305920b65ee 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
#include "orbsvcs/CosEvent/CEC_Dispatching.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index c1342545f4c..27bf794dd05 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index a5a977989de..f8891b2e576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Force CORBA::release(CORBA::Request...) prototype to be parsed
// before TAO_Pseudo_{Var,Out}_T templates. All required
// non-dependent names must be parsed prior to the template in
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
index 84f62c99fbf..d66d3bbd78a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index b77ffddc7fe..d443ae002cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Note: This class controls the behaviour of consumers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
// to ensure the correct EC is referenced.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 4389bfb2314..8cff927de90 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 6d02ae32db2..f92360df4c3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Note: This class controls the behaviour of suppliers connected to both
// the Typed and Un-typed Event Channels. A check must be made in the code
// to ensure the correct EC is referenced.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 6a5bba0262c..fadba6678b8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h"
#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index 2ad307d240b..865725f8b6b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index 0f075e4bef4..c0e73d0ad34 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
index 5d16512df9b..d4840f5f701 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
index 3bc4d00b86a..b8f3586843b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
index f5194fa05a9..f687e04cf58 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 1820a1ecc27..cdadf90a475 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosLifeCycle_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_LifeCycle_Export -Wb,stub_export_include=orbsvcs/LifeCycle/lifecycle_export.h -Wb,skel_export_macro=TAO_LifeCycle_Skel_Export -Wb,skel_export_include=orbsvcs/LifeCycle/lifecycle_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index c408c79b7f3..56b9e6fe4ff 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosLoadBalancing) : orbsvcslib, orbsvcs_output, install, naming, iormanip, portablegroup, ami, avoids_minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_CosLoadBalancing
idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 4adbf7028f8..4704e6e3d9a 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNaming_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index f7b411099d9..4027c56bef5 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portableserver {
sharedname = TAO_CosNaming_Skel
dynamicflags += TAO_NAMING_SKEL_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index d55c710bdc4..8db67d6fa25 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosNotification_IDL) : orbsvcslib, orbsvcs_output, install, event, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index 0ad6f6c5c3e..cc8c14704a3 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosProperty_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Property_Export -Wb,stub_export_include=orbsvcs/Property/property_export.h -Wb,skel_export_macro=TAO_Property_Skel_Export -Wb,skel_export_include=orbsvcs/Property/property_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 712e71e15f2..fe9d6c2202e 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosTime_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Time_Export -Wb,stub_export_include=orbsvcs/Time/time_export.h -Wb,skel_export_macro=TAO_Time_Skel_Export -Wb,skel_export_include=orbsvcs/Time/time_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index ad31677cab8..6b2243c4e03 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosTrading_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
index 0c634b97244..80b154784cb 100644
--- a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Daemon_Utilities.h"
#include "ace/Arg_Shifter.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
index 6f8a7d42aee..38cd86a6f92 100644
--- a/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Daemon_Utilities.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef _DAEMON_UTILS_H
#define _DAEMON_UTILS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 657348872be..db7be49f3d3 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, event, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 8e21e951446..c9ecec28b3c 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 940016b3e03..67465d70ff7 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(DsNotifyLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index 48e75601245..be736a7c572 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_BUSY_LOCK_CPP
#define TAO_ESF_BUSY_LOCK_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index b84042c958f..62fdae62ef7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_COPY_ON_READ_CPP
#define TAO_ESF_COPY_ON_READ_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 07aa3444b4d..fd1535e5e4c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_COPY_ON_WRITE_CPP
#define TAO_ESF_COPY_ON_WRITE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index bc317ef0748..5052c34c873 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_DELAYED_CHANGES_CPP
#define TAO_ESF_DELAYED_CHANGES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 934a360194b..29159239911 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_DELAYED_COMMAND_CPP
#define TAO_ESF_DELAYED_COMMAND_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index fc265f99772..37765884ca4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_IMMEDIATE_CHANGES_CPP
#define TAO_ESF_IMMEDIATE_CHANGES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 29aa2402b68..56ddea2d0a4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PEER_ADMIN_CPP
#define TAO_ESF_PEER_ADMIN_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index ad5c499c685..5ba55a59e4c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PEER_WORKERS_CPP
#define TAO_ESF_PEER_WORKERS_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index a0b52b8a642..47dc3e6d917 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_ADMIN_CPP
#define TAO_ESF_PROXY_ADMIN_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
index 1691a2dcc02..64154fe0806 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_COLLECTION_CPP
#define TAO_ESF_PROXY_COLLECTION_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 39d0c271894..ff57ce85e4e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_LIST_CPP
#define TAO_ESF_PROXY_LIST_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 3afe6bbc7e3..462e0542d1b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_RB_TREE_CPP
#define TAO_ESF_PROXY_RB_TREE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index f9d67c5a5e8..5ee83f5becd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
#define TAO_ESF_PROXY_REFCOUNT_GUARD_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index 2694b25b984..a60a7f02583 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_REFCOUNT_GUARD_CPP
#define TAO_ESF_REFCOUNT_GUARD_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 68274471b1a..adceefff7ec 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_SHUTDOWN_PROXY_CPP
#define TAO_ESF_SHUTDOWN_PROXY_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
index ef8c4ad0f37..bf44a389032 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ESF_WORKER_CPP
#define TAO_ESF_WORKER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/ESF/esf_export.h b/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
index a9c7cd1fd3a..f1182c3b970 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/esf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
index 50df688ca02..b52c4f60d5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Adapters.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 8b67077e1b3..7115d407a11 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index ea0ad2cdb97..a46244b6dfb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index df74a62ce97..b4968b356b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Complex_Address_Server.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index f3f35179378..47557ef714e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 5aac6d70046..970534d4332 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Mcast_EH.h"
#include "orbsvcs/Event/ECG_UDP_Receiver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index b97ffe9e144..a679bd3b058 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index a5a4218981e..bad8ff7df7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 3f076ddbb58..0ca681bb896 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h"
#include "tao/Messaging/Messaging.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 73e6ae0e2a9..1d1249873ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index 202c2540f6b..bce028cdd7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index a6d5f20ef27..b0e6e278d68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_UDP_EH.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 119d4cf8628..0d27483b7eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
#include "ace/INET_Addr.h"
#include "ace/Sock_Connect.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 869e623b18b..6ac398553b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/ECG_UDP_Receiver.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 410fc180797..91fdf765749 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_And_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 27e04d65611..8be15fbd97d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Basic_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index f5d247f36ff..1b9b0b086cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Basic_Filter_Builder.h"
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index a68adc7021a..8a7ca6dac53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Bitmask_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index 904bf799c30..4a3430d6980 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_EC_BUSY_LOCK_CPP
#define TAO_EC_BUSY_LOCK_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 1ee8109222a..84fdb2899bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index a6f15eac907..da902aa0dc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index c1b9f29b326..88687550c3e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index ec83a5c164e..be407512e4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index dad5e5bc70c..a4a3ab1b358 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index f7d07b20315..da8a8b21e9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 8b15c1a39ef..4654957fd54 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Disjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 1f42a3a762d..b5859e21960 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 44e52d115ed..35d689302dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Dispatching_Task.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index f8e9cd7023e..233169439f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index 87227b52c6d..9747d1b82e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 13afbe4f81a..f3d296bed6b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 94628a5ff5a..f5534a16d02 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 24f7ce3a85d..01770ba6105 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Filter_Builder.h"
#include "orbsvcs/Event/EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 01c0f5c1e8c..6f9d31798ae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index f1d28246f74..d8287744bc6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP.h"
#include "orbsvcs/Event/ECG_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index a10b2098cc6..df33e3292f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
#include "orbsvcs/Event/ECG_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 9cc898d7698..428104e1233 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Gateway_Sched.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 77bd6021c07..e88563d6522 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Group_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
index e918d295929..8fbfc0adcf3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
TAO_EC_Group_Scheduling::TAO_EC_Group_Scheduling (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index d5e04983a7b..59be08f552e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Dispatching.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index b30a44d6b65..34adfa62c22 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Kokyu_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index e297ac02047..d7298071032 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 2c474004024..79c76c9860c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index a94a6f5728f..7d42ab54663 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Kokyu_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
index a87c7a83d51..ffd84b5ba76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Lifetime_Utils.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index 360f6d11744..d164e06378f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_EC_LIFETIME_UTILS_T_CPP
#define TAO_EC_LIFETIME_UTILS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index d73fad387bf..e75e12bb54e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_MT_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 55219040071..dc550ba2fda 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index b2b0c6b7f43..41ce09ab69b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Negation_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 8304b895e65..71411aa2818 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Null_Factory.h"
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 4fde40b5ae8..05438b6adf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Null_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
index 60c72cb9e56..f1c2a48bd5c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3da8854d4b1..45475044d95 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ObserverStrategy.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 63824d13eda..0e9321ab8c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Per_Supplier_Filter.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index ab4cabf6723..855a58e620a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Prefix_Filter_Builder.h"
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 16b71d22bd1..5f5eb1383f6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Priority_Dispatching.h"
#include "orbsvcs/Event/EC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index d4e40a598d7..750d6dd82dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Priority_Scheduling.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 1743749c7a5..8260288b13d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_Supplier_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 707dfe69374..23d9a366eb9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_Dispatching.h"
#include "orbsvcs/Event/EC_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 522f6ad45e0..c824514b2c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_QOS_Info.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 3f2770ff0eb..cb057292fc2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
#include "tao/RTCORBA/Priority_Mapping.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 48e44f70852..01d6063199d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index d85bdee6d82..e23bf2bc0fa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
#include "orbsvcs/Event/EC_Reactive_ConsumerControl.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index 1d384bd5092..f9011dc1df8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 369add84a12..070edd73045 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierAdmin.h"
#include "orbsvcs/Event/EC_Reactive_SupplierControl.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index 9df36523c84..19acc6826e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index c24e66102ae..56c9af969ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_Sched_Factory.h"
#include "orbsvcs/Event/EC_Priority_Dispatching.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 7828330e5c2..d85da896b8f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Sched_Filter.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 5625bf412b7..6db96184ed2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Sched_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Event/EC_Sched_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
index edeafe0f87c..88ca6abf682 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 812865a639a..7ed8c79aad1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierAdmin.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 63c4e91e295..a24ce675bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_SupplierControl.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index b606d150ec8..3534ca66a7c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_QOS_Info.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
index a06f36274f1..02b830ff850 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index e87f3619963..42931c188f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_Dispatching.h"
#include "orbsvcs/Event/EC_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
index f70fb6aeac9..0668ec73009 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index 2502bbbe980..d4904b5a195 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index 4519384a419..cb1164d14a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 28489c6aa39..e234f48dcab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
index d08f0c146ec..17a151c12e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Thread_Flags.h"
#include "ace/OS_NS_Thread.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 27161888e63..dde8279502e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#include "orbsvcs/Event/EC_Timeout_Generator.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 2b219948810..60278f39599 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Timeout_Generator.h"
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index b4f61f8a4a4..7dea70568b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Trivial_Supplier_Filter.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 90e81d0293f..77bcb2af011 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Type_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 2700fcc4d22..5068fd0edfc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_UDP_Admin.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_export.h b/TAO/orbsvcs/orbsvcs/Event/event_export.h
index 87a6ddf5a12..d3529fff34c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
index a6f6ba465be..d9fc62aadfb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
index 70c88d4289e..3652a1f0e9f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/event_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
index e2af98341c2..35785ee1d49 100644
--- a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h b/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
index 9d56447dabd..db5edc21c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/rtkokyu_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_RTKokyuEvent
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h b/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
index b9697e05882..651d719d91a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
+++ b/TAO/orbsvcs/orbsvcs/Event/sched_event_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 5a2f1eeace2..aaee3390c4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index b4d23c389de..f14f104dffc 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FTORB_Utils) : orbsvcslib, orbsvcs_output, install, iormanip, portableserver, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_FTORB_Utils
idlflags += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
diff --git a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
index 044248938b4..b114898507e 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replication, install, naming_serv, naming, portablegroup, loadbalancing, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_FT_Naming_Serv
idlflags += -Wb,export_macro=TAO_FtNaming_Export -Wb,export_include=orbsvcs/Naming/FaultTolerant/ftnaming_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 3aac23ca003..99bbe325534 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(FaultTolerance): orbsvcslib, orbsvcs_output, install, pi, pi_server, notification, ftorb, portablegroup, avoids_minimum_corba, tao_versioning_idl_defaults {
sharedname = TAO_FaultTolerance
idlflags += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index d3b138a0eac..6d962207047 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
index 37769e226ad..e136474d29b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORB_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ClientORB
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 3fd4f289aaf..697bfb25d95 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index d48d2676c1a..2db58389364 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
index 8566f4f5c7c..11844309254 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index d3ab4c835d7..10f9aa9c141 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
#include "tao/SystemException.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index e4ec2ec96eb..fd5333e870b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 6ae26e008ca..638686d0048 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
#include "tao/Profile_Transport_Resolver.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 3e94b92af6a..6193f8a3733 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
index f492009ae85..40cf285750b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORB_Utils_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ORB_Utils
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 0de8565abfa..079a6ae3582 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
index 565f0b73165..473cb6fbd5e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORB_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FT_ServerORB
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index 3e9074a07c2..39bfddf8c53 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index ef5754b47b4..85e8eabfff0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
#include "tao/IOPC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
index 46af5f23fe9..e48abf59844 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
index 9c2431b8e15..3b584bae7fb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 0f2f1e1d1d6..e4ab0334684 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
index 2179965445a..96eb6be4394 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/fault_tol_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtNaming.mpc b/TAO/orbsvcs/orbsvcs/FtNaming.mpc
index c36764fa984..54b2aedde50 100644
--- a/TAO/orbsvcs/orbsvcs/FtNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtNaming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtNaming) : orbsvcslib, orbsvcs_output, install, naming_serv, portablegroup, avoids_minimum_corba {
sharedname = TAO_FtNaming
idlflags += -Wb,export_macro=TAO_FtNaming_Intf_Export \
diff --git a/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc b/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
index 4333fa87799..02d0972ac8c 100644
--- a/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtNamingReplication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtNamingReplication) : ftnaming, orbsvcslib, orbsvcs_output, install, naming_serv, portablegroup, avoids_minimum_corba, ftorbutils {
sharedname = TAO_FtNamingReplication
idlflags += -Wb,export_macro=TAO_FtNaming_Export -Wb,export_include=orbsvcs/Naming/FaultTolerant/ftnaming_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index feb3e0f3d04..5ea27b77fab 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (FtRtEvent) : orbsvcslib, orbsvcs_output, install, ftorbutils, rtevent_serv, naming, avoids_minimum_corba, pi_server, tao_versioning_idl_defaults {
sharedname = TAO_FtRtEvent
idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index 1be01bbea6c..9e9419bd0af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index f21c6f11bcb..2437068b3eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
#include "tao/MProfile.h"
#include "tao/Stub.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 35b4c304d90..8c4824aad36 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
index 9dad27d931a..0733d263717 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FTRT
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index ffb6e29e2bd..80a00b4b270 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index b58fe8c42f4..8a8416ab398 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 846efb58bac..4c9a470ec4c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index 928cb376771..cf79e91b2a7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
index 3278a9ce899..ca23b8611f3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
#include <assert.h>
#include <algorithm>
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
index 7f567ab80bb..f33c60ba71e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index fe440c891cf..2fe7edd1eaa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Event/EC_ProxyConsumer.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index 7e7121b0c88..3ed1b7628f0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Dynamic_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index d9ba04ecf48..46bda339433 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index 2290a1bebfd..6056a120fe9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index a05cebc669f..5bda4749140 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -1,6 +1,4 @@
-// // $Id$
-
-#include "orbsvcs/Log_Macros.h"
+// #include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 64aff6a04ba..7d74d1cd4fc 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h"
#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 443c3dac7ef..6701e3ad7cd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 39a4175c5c5..34b5848c15b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
#include "../Utils/activate_with_id.h"
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index e417eb44182..0240e85014c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_ProxySupplier.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
index 9666d6e5480..95e4e90915e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef FTRTEC_SERVICE_ACTIVATE_H
#define FTRTEC_SERVICE_ACTIVATE_H
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index 25ae47a7977..e8f4ae86d5f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/PortableServer/Servant_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index f1d3cf998bc..a2734de4911 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "tao/PortableServer/POAC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index f7829740eea..8f04f5d83be 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Reactor.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 7a7e9b870df..7485754612d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index 2760efbcee2..dce113ccd3a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index a7543bc8a0d..788a65217af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index eef8424fbdd..8796c03aca0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "ace/OS_NS_string.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 4562cb95160..2971584dfe6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
#include "../Utils/resolve_init.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 9c82cab7c45..f3cc27ee85e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
#include "tao/MProfile.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 15b46f005a0..b1ea8b8744e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
#include "../Utils/UUID.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index 4ca242fd20a..97c83c66083 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index e70726ca265..ef2a6118cf8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
#include "orbsvcs/Event/EC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 8c9e8dce508..9aa01c5311c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
#include "orbsvcs/Event/EC_Event_Channel_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index b9bf488c9a0..9f43f278154 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
#include "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index 357a2396f9b..f6c0611358a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index ec58a65597d..d187dcbbf7b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
#include "../Utils/resolve_init.h"
#include "../Utils/UUID.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index ec06fa1097e..121fd873499 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h"
#if (TAO_HAS_SCIOP == 1)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 3bc8ec8ed10..e8db0df6b9f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "tao/CDR.h"
#include "tao/AnyTypeCode/IOPA.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index db3f9f2877c..51ef90738f3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
#include "ace/Guard_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 4c2d3ba285b..c62bf2a1164 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index a3d024e7eec..f820feb8adb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
index 2c404b4a134..848b4f59a83 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FTRTEC
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
index 4b684ac136b..76976f5950a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_string.h"
#include "ace/Log_Msg.h"
#include "tao/Object_KeyC.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index 25a322dacb5..80a774bfcd4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
#include "orbsvcs/FtRtEvent/Utils/activate_with_id.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
index efd4b53376c..40d84f5e85a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
index f3133e01cbe..b5c776f74af 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
@@ -1,7 +1,6 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtRtEvent
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 67bb0430ca7..c5a3b8dfb46 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
index 525a9ab4609..6c96dce9af9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTIOP_ACCEPTOR_IMPL_CPP
#define HTIOP_ACCEPTOR_IMPL_CPP
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
index 30f1d954ce7..ff8a07a0be6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index ad5d9117789..1917da10b24 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index 2ec67810b5f..c599bddeeba 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
index 9101067b6ee..110885ef92e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef HTIOP_CONNECTOR_IMPL_CPP
#define HTIOP_CONNECTOR_IMPL_CPP
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index b7b4ccaf82e..f54168e2603 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
#include "orbsvcs/HTIOP/HTIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
index 858abf88a1a..18c22afc684 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl -s HTIOP
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index e390b46cef4..443def1b352 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/HTIOP/HTIOP_Factory.h"
#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
#include "orbsvcs/HTIOP/HTIOP_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index b792afb510c..ab4e94d9819 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -1,6 +1,4 @@
// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 67e7a12097d..1f0ec2faa71 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/HTIOP/HTIOP_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index 9b7f3935f58..7d5b6dd052d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(IFRService) : orbsvcslib, orbsvcs_output, install, typecodefactory, svc_utils, iortable, ifr_client_skel {
avoids += ace_for_tao uses_wchar // Requires ace/Configuration
sharedname = TAO_IFRService
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 83b3658a41a..c08eb8ef809 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index c099bfd8005..69bfa6d3606 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AliasDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 217dc001d4f..bbecccf97f4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ArrayDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 38e2c4e79f0..0691ca9449c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/AttributeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 986d20bc47c..481e7e98677 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/ComponentContainer_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index 823de5e1217..bbbf8a5519e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ComponentDef_i.h"
#include "orbsvcs/IFRService/ProvidesDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
index 010b1a3f86b..63c10e9dc3e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index b446b9b2731..644bbc5af99 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/ComponentRepository_i.h"
#include "orbsvcs/IFRService/ModuleDef_i.h"
#include "orbsvcs/IFRService/ComponentDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 38359a44621..59229c7818e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ConstantDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index 181f0007e49..d991b8009bc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ConsumesDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 13962884ca7..360c1395929 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/concrete_classes.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 2e2430b4fe1..b80036b9164 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
#include "orbsvcs/IFRService/ValueDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index e4d3f6bc2a4..424f8674e3c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/EmitsDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index beeaaa4b4f6..9c6c11fa9ae 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/EnumDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index e6378e02778..94a36220fe5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/EventDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index fb09253aaee..bf67c03d0c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/EventPortDef_i.h"
#include "orbsvcs/IFRService/EventDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 987665fe35a..54a720bc9df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExceptionDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 2833d46a52d..649c86a069e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 659c10e789f..4c532eab20f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtAttributeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ExceptionDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
index 9c75add9a8e..55c6413a73a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index 45e40c2113e..0d7c2d6fbdd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 3c07539de7b..fea208127a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ExtValueDef_i.h"
#include "orbsvcs/IFRService/ExceptionDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index 8d5746aeb21..4ad931fe56a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FactoryDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 4bd3c1cdfa9..8a7abfb8312 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FinderDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index d6595766ee6..50a59fe7ca6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/FixedDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 04f1a001796..97d7bc8c76f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/HomeDef_i.h"
#include "orbsvcs/IFRService/FactoryDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
index 7bf02f0ae7a..78c10859022 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/IDLType_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index eacb3615531..fa7b25f8c37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// DESCRIPTION
// This class allows for dynamically loading
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 571bb11b518..84938c8c2eb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// IFR_Service_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index a414a701c71..2ee9ffd3c7e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index b14ea64add8..1ca4e7ece07 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_IFR_SERVICE_UTILS_T_CPP
#define TAO_IFR_SERVICE_UTILS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
index d01bb3dd710..1eca550b6e1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_IFR_MACROS_H
#define TAO_IFR_MACROS_H
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index fcba2cd91b3..4b4bf77db08 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/IRObject_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 14f30134bf7..5a7cffef327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/InterfaceDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index ac79f5c8673..1baecb43533 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/InterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/AttributeDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index 23a9aaaf2f1..d078ec7ca7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index a7da3cafef2..9f5b20010d0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ModuleDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index b7d0b53a7c5..d3bdb5e3192 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/NativeDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index 2ddd93df9b3..73c79b50ff2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/OperationDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index 2a3d6dd42f1..dd6ba317df2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Options.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index 8057cb13292..44af15021ad 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/PrimitiveDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index bdc5e6b600a..796f36acfb2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ProvidesDef_i.h"
#include "tao/IFR_Client/IFR_ComponentsS.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index a56cdb69f33..40f64d82e02 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "orbsvcs/IFRService/PublishesDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
index 1afe5aa9f03..2fadd038cd7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/RecursDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index e69d10de9d7..3711e269ef8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/IFRService/concrete_classes.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index ebcb39f0971..3badf1b343e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/SequenceDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index 3cf74f3419e..d065fb17b9f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/StringDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index 746c02d3d3b..a5586fd2f8b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/StructDef_i.h"
#include "orbsvcs/IFRService/RecursDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 21ce6101074..486c5fd408b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/TypedefDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index c4adc184db2..e77bcc3742a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/UnionDef_i.h"
#include "orbsvcs/IFRService/RecursDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index e61129af886..7c8b1435634 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/UsesDef_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index f26ac872e2b..178c524cd76 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/ValueBoxDef_i.h"
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/IFR_Service_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index e03411570f4..b79502df952 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ValueDef_i.h"
#include "orbsvcs/IFRService/AttributeDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index a0684102f15..d446026e696 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/ValueMemberDef_i.h"
#include "orbsvcs/IFRService/IDLType_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 5fb533bf8c0..5c1227b73f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IFRService/Repository_i.h"
#include "orbsvcs/IFRService/WstringDef_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
index 4e1aed48095..c552ccad250 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ifr_service_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 35691e93493..4e62181384b 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/IOR_Multicast.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
index 3ceb2c30777..5a2617821a8 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
+++ b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
index 3cdab54cec4..080e6aefda4 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/LifeCycle/lifecycle_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 2a0b92278e1..cae9a5df6bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
#include "tao/ORB_Constants.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index d603cbdb3f9..18568bc60e9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index f4b24ada9ec..e8b7ed58bdd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientComponent.h"
#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index e864c5988d1..89b0c581d9a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index ebc3a86b345..f0db0d42c80 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
#include "orbsvcs/CosLoadBalancingC.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 41217b5c678..0094a7f89cb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Component.h"
#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 150cc923d20..cd1014d001f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index ab02d2a1e05..7768d687e3f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 14f936db278..dab05290bac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 36c7c466dab..fbba4fb425c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 9e9dd6f6f8a..0492f39e912 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index a2c0736974b..506b720ddb1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 31a8295e90a..b82e476c630 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 7fd48a41d18..506deccc859 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 38f75a53234..5037d43326b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 17e3f69d17a..156e5ae770e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 393133e667b..90fda5e5db8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 2a51c58cc23..a84d6345130 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index c4929eb7211..96dcc7c5f31 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_Random.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index e1d131551b6..cfddac5559a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
#include "orbsvcs/PortableGroup/PG_conf.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 0edb006334a..bccb7ac7c05 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
index 10ec8a56fe1..04a6eb5840b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 0b63a8e911a..27860277a4f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/BasicLogFactory_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 4344c106a94..d55c9656420 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/BasicLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 148855076df..abc0f9e0718 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index c20bd1280d4..bad86505f10 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/EventLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 7b3607043d0..16e8d79994b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/EventLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index c08a3d2475c..90bb1ee624d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/EventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index e12cfa7ca78..6ad7296b210 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_Iterator_i.h"
#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 8a6282c68a6..961c2839023 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 6dfcabcf013..1cbfed1dc8c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_LogStore.h"
#include "orbsvcs/Log/Hash_LogRecordStore.h"
#include "orbsvcs/Log/LogMgr_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
index fb31e17e4de..f8ca79e9617 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Hash_Persistence_Strategy.h"
#include "orbsvcs/Log/Hash_LogStore.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 1030312d93e..751c18bdf8c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Iterator_i.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index e55967a9c6f..4a74572ba58 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogActivator.h"
#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 42be2a77a14..f9db2b037ca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogActivator.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 86f552fc827..0e49232f712 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index dfea7195131..dd2b50b8f31 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogRecordStore.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index c1dd0b9b418..50096e1a450 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Compaction_Handler.h"
#include "orbsvcs/Log/Log_i.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 529e9a2fca1..c6799199f43 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 070861f05c3..c5485ab1291 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Constraint_Visitors.h"
#include "ace/ETCL/ETCL_Constraint.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index d06f2f32ed6..2d93a53ee41 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/Log_Flush_Handler.h"
#include "orbsvcs/Log/Log_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index a90c290e339..0ea1c37ee15 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log/Log_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 977fee816fa..b9d834eafad 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 16bce9394ac..ab114d23ada 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/NotifyLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index a3d233de824..3ebc0c046a5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/NotifyLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 22c8d52bde5..db2aaaf9226 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/NotifyLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index da181905372..1e26e39f1fa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 8e3b5959735..ffe4ebc38af 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLogFactory_i.h"
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/RTEventLogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 8493b9c4f93..27929151778 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/LogNotification.h"
#include "orbsvcs/Log/RTEventLogNotification.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 06fbbfa03f2..08f783e807c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log/RTEventLog_i.h"
#include "orbsvcs/Log/LogMgr_i.h"
#include "orbsvcs/Log/LogNotification.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.cpp b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
index ffbffee019d..109657aa113 100644
--- a/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log_Macros.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Log_Macros.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log_Macros.h b/TAO/orbsvcs/orbsvcs/Log_Macros.h
index 5ef52e4aeec..7ff2d11aa72 100644
--- a/TAO/orbsvcs/orbsvcs/Log_Macros.h
+++ b/TAO/orbsvcs/orbsvcs/Log_Macros.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_ORBSVCS_LOG_MACROS_H
#define TAO_ORBSVCS_LOG_MACROS_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 2c6c4cc05c1..2266e5903fa 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_BINDINGS_ITERATOR_T_CPP
#define TAO_BINDINGS_ITERATOR_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 4e677c31071..3fa33442554 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h"
#include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index a46e23c244b..6e1601e8070 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
index 4ca19e74c1d..e2c7b9f0a93 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
index 9b267d15590..4ebab318def 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Random.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
index 132d2a25d3a..cf8ce6ff34c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index 2428bfe6544..5258debc311 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
index d19b70cadfd..3841f3ab41c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h"
#include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
index e8a204363c9..6cdee6931de 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtNaming
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
index 6b52adde64a..03532f0b18d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/ftnaming_intf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_FtNaming_Intf
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index a3087e3483f..92255b51454 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 442cc47d70d..b1b7a9da824 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ================================================================
// LIBRARY
// libTAO_CosNaming.so
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index c5bb1016bee..1c1e39cca86 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ============================================================================
// FILENAME
// Naming_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index b1f46ceb5ac..dabfec5c7e2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 6d9aaad46a1..ad4a4f071ab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Persistent_Context_Index.h"
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index a1b4e08ef72..8fdbbec5cd4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
#include "orbsvcs/Naming/Persistent_Context_Index.h"
#include "orbsvcs/Naming/Bindings_Iterator_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 0ce4e46025a..994acadbd16 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
#include "orbsvcs/Naming/Persistent_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index a56d9a03418..cef909af7c7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Naming/Storable_Naming_Context.h"
#include "orbsvcs/Naming/Storable_Naming_Context_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
index 78a91dd1a57..aab70bacbd3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Naming/Storable_Naming_Context_Factory.h"
#include "orbsvcs/Naming/Storable_Naming_Context.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
index 3bc9c600e49..da1bd4d888c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
index 220b76294f0..7ad081f4c64 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
index aef94b094c2..b5c7082fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 55cbf08504d..3dc8a3af5fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/Admin.h"
#include "orbsvcs/Notify/Validate_Worker_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index d1a249052ba..542749dcc13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/AdminProperties.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
index 4f39ccb53e0..92043029904 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef ALLOC_TRACKER_H
#define ALLOC_TRACKER_H
#include /**/"ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 1f0ef328be9..28871268029 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/AnyEvent.h"
#include "orbsvcs/Notify/Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index 449328b0400..7f7780af34e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 34caef24451..0e0ca240abc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index d0ba4e34035..e0ff8ad2b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index 3c5b31d52a6..f30948eae05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 6f84f19e964..d130e72d1e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Any/PushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index d3a63c25dc0..69db801841f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Any/PushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
index fd77791b525..34098fab019 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Bit_Vector.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index bed549f7365..130e2fe785c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Buffering_Strategy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index 931ffbf8bc7..d789e146bbb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/Builder.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 821b53650bd..b0f247456b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Consumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 5ed4b550015..4c45bd1404f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ConsumerAdmin.h"
#include "orbsvcs/Notify/Subscription_Change_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f7960fa9fdf..0e7c3617a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_CONTAINER_T_CPP
#define TAO_Notify_CONTAINER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 6ee12bec12f..1b1abd51aa4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/CosNotify_Initializer.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 2a03d60c994..6f79de052cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index cad7acc0732..a17a30f6aae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Default_Factory.h"
#include "orbsvcs/Notify/EventChannelFactory.h"
#include "orbsvcs/Notify/EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index 8b7eb98c875..3bec07b367b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Delivery_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index de873b0969b..1117bda47e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_NOTIFY_DELIVERY_REQUEST_H
#define TAO_NOTIFY_DELIVERY_REQUEST_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index ae1d262a9a3..b9a8c147a14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ETCL_Filter.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index a6d28b1e257..83223cc25c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ETCL_FilterFactory.h"
#include "orbsvcs/Notify/ETCL_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index 783892b8c94..0b75982cd13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 8947a8d539b..c0e30c6fe10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventChannel.h"
#include "orbsvcs/Notify/Container_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 33536380395..26c57aa73fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventChannelFactory.h"
#include "orbsvcs/Notify/Properties.h"
#include "orbsvcs/Notify/Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index eb5c4166582..7ee8a94b6b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/EventType.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 31d93b598a7..906e103d2cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/EventTypeSeq.h"
#include "orbsvcs/Notify/Topology_Saver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 61ad42ca002..e279d4f93e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Event_Manager.h"
#include "orbsvcs/Notify/ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index eb443c36ce5..4703cff5773 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_EVENT_MAP_ENTRY_CPP
#define TAO_Notify_EVENT_MAP_ENTRY_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 655bdb5d4da..09478a46c01 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_EVENT_MAP_T_CPP
#define TAO_Notify_EVENT_MAP_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
index efa5868c157..0bfdbf409ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Event_Persistence_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index b1fdb3ae7da..f4225943a3a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_FIND_WORKER_T_CPP
#define TAO_Notify_FIND_WORKER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
index a3dfb15c323..eca1d32f6f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/ID_Factory.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index 89f4e5c1672..e43bf8d3057 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 362306c9e5a..3a420766747 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Method_Request_Dispatch.h"
#include "orbsvcs/Notify/ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 23ccc52f11c..519b1ff0a47 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Event.h"
#include "orbsvcs/Notify/Delivery_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index b7f8390fcc0..2a3cf610e46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Method_Request_Lookup.h"
#include "orbsvcs/Notify/Consumer_Map.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index e64ba1478b2..5a25e497aae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Shutdown.h"
#include "orbsvcs/Notify/ThreadPool_Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index c0be8172969..14f93d48e73 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Method_Request_Updates.h"
#include "tao/debug.h"
#include "orbsvcs/Notify/Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
index 19db54e852f..cb7fb72b028 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Method_Request_Updates_T_CPP
#define TAO_Notify_Method_Request_Updates_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
index 09638e1e7f1..73e63738be3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
index d5d39a9ceef..1c7441ce69b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONTROL_H
#define CONTROL_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
index a990e30d17f..2dce7e4ea36 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Notify/MonitorControl/Control_Registry.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
index 4af81970679..71b48b13451 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONTROL_REGISTRY_H
#define CONTROL_REGISTRY_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
index c7164c2c004..86f21431161 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef DYNAMIC_STATISTIC_H
#define DYNAMIC_STATISTIC_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index d8b0fb9c771..cdee710b3d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControl/MonitorManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 60e58d1b9c3..c57f50caac8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORMANAGER_H
#define MONITORMANAGER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
index 313c191771f..2a9a03ec6ec 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
index e0371c48c63..779db3ac50f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NOTIFICATIONSERVICEMONITOR_I_H
#define NOTIFICATIONSERVICEMONITOR_I_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
index 8116c9d96a9..348dedc6c8d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h"
#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
index ef4d5a049f0..b93e4150e2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TIMESTAMP_MONITOR_H
#define TIMESTAMP_MONITOR_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
index b5d61ac9112..7882f275b2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_MC
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
index dc9f518bbdf..e946037365d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
index 33b9f4ea744..72063c91920 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
index 3bd05a1898a..6847580b12d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
index 69784a93035..b86bd4e1147 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORCONSUMERADMIN_H
#define MONITORCONSUMERADMIN_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
index 741b58ce04b..5b9b6f9470b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
index e4185d6a642..bde87202bf9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITOREVENTCHANNEL_H
#define MONITOREVENTCHANNEL_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
index 3cbd5a684a6..d3de46ab273 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h"
#include "orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExtC.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
index 82a2a20f7a4..311fb73d097 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITOREVENTCHANNELFACTORY_H
#define MONITOREVENTCHANNELFACTORY_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
index ddb18342519..e1b4a41102a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORPROXYPUSHSUPPLIER_H
#define MONITORPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
index 49fd09ee747..2bc12122e6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORPROXYSUPPLIER_T_CPP
#define MONITORPROXYSUPPLIER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
index cd07f0f4160..3ca80ef6ee4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORPROXYSUPPLIER_H
#define MONITORPROXYSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
index 8c09c9199ec..85aecff20cb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORSEQUENCEPROXYPUSHSUPPLIER_H
#define MONITORSEQUENCEPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
index e73e44a979e..b03d3ab657d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef MONITORSTRUCTUREDPROXYPUSHSUPPLIER_H
#define MONITORSTRUCTUREDPROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
index 79d2314656a..b1e55e19a79 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
index f15f886431a..568e731f16e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MONITORSUPPLIERADMIN_H
#define MONITORSUPPLIERADMIN_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
index 32c928c1c3f..68be46bd690 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/notify_mc_ext_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_MC_Ext
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 5f010a942bf..5eaa04c9ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Name_Value_Pair.h"
#include "orbsvcs/Notify/Property_T.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 0b61d939e73..e0f0a0a8b38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 82db9bbe20a..eb1e3c4e429 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
#include "ace/ETCL/ETCL_y.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index 8c4240d3562..f0af71d982c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index 1df38ad143d..21421e091e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index bf1a26405e5..44687d95c71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index d10cea93e9a..6648d5e5ffd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 4dfef2b2520..1f054b234fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
index a73b9be6a6c..25f53b08408 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Notify_Extensions.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
index 247e7655d40..485934e3506 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_NOTIFY_EXTENSIONS_H
#define TAO_NOTIFY_EXTENSIONS_H
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index 566d6e53a97..adb740a2803 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Object.h"
#include "orbsvcs/Notify/POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 38a12d5b0e9..b81da9bd7dc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 638f137837c..d76ad81625d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Peer.h"
#include "orbsvcs/Notify/Proxy.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index f6af479ef31..316f93a140a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Persistent_File_Allocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 4cbe789d226..73262ca1adc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Properties.h"
#include "orbsvcs/NotifyExtC.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
index 3c16c4a998d..27d5d57ae16 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/PropertySeq.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
index a18ef874290..c34d6de91c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Property_Boolean.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 3bf8ec43400..db3745cf760 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROPERTY_T_CPP
#define TAO_Notify_PROPERTY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index c9a6215ad8d..a82555e7620 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Proxy.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index ba1cf392883..f6a54aefa5c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ProxyConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index 7765c5c7ff4..3b329e4723a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROXYCONSUMER_T_CPP
#define TAO_Notify_PROXYCONSUMER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index aef2fa47d3b..46b2740b2e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/ProxySupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index af9dfa473e1..f65acbbb9c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_PROXYSUPPLIER_T_CPP
#define TAO_Notify_PROXYSUPPLIER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 5896124519f..8c73a057172 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Proxy_T.h"
#ifndef TAO_Notify_PROXY_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
index 0c69b40abf9..4a5e67a70c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/QoSProperties.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index feb4243bef7..4437626e758 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/RT_Builder.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index a8d76ace45b..70a45839531 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/RT_Factory.h"
#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index 9fa8eb470a7..575205e48a4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/RT_Notify_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index ae95372a1c5..e02725450a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/RT_POA_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
index 86502f17a4c..8967dd68fa3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/TAO_Singleton.h"
#include "orbsvcs/Notify/RT_Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index b18a023dc85..b1e3488ab5e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Random_File.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index bcb6ba730c9..c23841d19cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Reactive_Task.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
index 9abb4399a7d..e95438ef6b4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Refcountable.h"
#include "tao/debug.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
index d2168a2af03..c2a84f77284 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
#define TAO_Notify_REFCOUNTABLE_GUARD_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 9a5180f0331..bcaebbc7c1e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Routing_Slip.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 4c652a3a8b3..820ba315d17 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Routing_Slip_Persistence_Manager.h"
#include "orbsvcs/Notify/Standard_Event_Persistence.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
index d796caafcd4..1d80681e510 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Routing_Slip_Queue.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 9912a881334..754cd9c72cd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
#define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index 5419484f854..8b394884503 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_SEQ_WORKER_T_CPP
#define TAO_Notify_SEQ_WORKER_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index 203f967e984..b5e9fc336b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index 8e71cf47315..faf990d3aca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 2d68e2fa003..00a8f1805d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
#include "ace/Truncate.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index 692250847cb..227d634859e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
index 86623a3a2ef..42288ac9f09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Service.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
index 34275c453e5..0d6dc11b5aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Standard_Event_Persistence.h"
#include "orbsvcs/Notify/Persistent_File_Allocator.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 382c218fb2a..ea0aa2940e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index bd26cb6f700..c321d27da66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredEvent.h"
#include "orbsvcs/Notify/PropertySeq.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 6d468c28193..dbfe3ba3127 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 558bc94977c..4cf50ad0d2f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 331784106bc..69d2a6334a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
#include "ace/Bound_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 7a63b07e5bd..92ab7846873 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 2a6902f07a9..b2705c86d71 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Subscription_Change_Worker.h"
#include "orbsvcs/Notify/Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index cc65384f911..1cb7f208491 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index d74bb377bda..30406d7453a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/SupplierAdmin.h"
#include "orbsvcs/Notify/Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 2a4f6d88ad9..eebc10e0b92 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/ThreadPool_Task.h"
#include "orbsvcs/Notify/Properties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
index 9b46dc770da..ed37ea1caca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Timer_Queue.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
index cc1e944a3a8..ef42a417287 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Timer_Reactor.h"
#include "orbsvcs/Notify/Properties.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index 11736c14a7a..d061c815db5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Loader.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index 58341e40b4c..ec88590b269 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Object.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index 77adc658cb0..f8ba3dd7751 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Topology_Saver.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
index 206db007990..c9fdfc61130 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/Worker_Task.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 5809d42f63a..5285d07672b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Loader.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 271b176a985..4f7207d4118 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Saver.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
index a9f27bf4d1d..5ce286c6bc2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Notify/XML_Topology_Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
index d17be740d41..7d811c8413d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
index ae5ef11a7b9..378ab5d6897 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_persist_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl TAO_Notify_Persist
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
index ec47ee40ada..5134037ceda 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
index 52b01d16fd6..aab98c8a62e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/notify_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h b/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
index 288a67cb67f..190e0219185 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/rt_notify_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl b/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
index 199b8d40398..e7e4b739af2 100644
--- a/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
+++ b/TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Null_MediaCtrl
{
};
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 3d3a9deca4d..f4bf56d1aa8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(PortableGroup) : orbsvcslib, orbsvcs_output, install, naming, iormanip, messaging, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_versioning_idl_defaults {
sharedname = TAO_PortableGroup
idlflags += -Wb,export_macro=TAO_PortableGroup_Export \
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
index 10947ea7ffb..3612005ea7b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index ece5c0b0cac..22845604ce4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/GOA.h"
#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 103c0ccc3cf..444629713cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/MIOP.h"
#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index eb8926d3d3b..9e41c5915ba 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 66b3dd604ce..87f2526b88c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 6b0647da9a7..38065e3962e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index 575362b9f4a..9ec99126a3c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Group_Guard.h"
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
index 297498d0f5a..f1ccf0d0267 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
index 041dcd7e9bf..2a975de02d5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
index de149f4b401..91dd26c44d1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index e658eb7d75b..e1fdbd1a339 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 269b0b839e6..11507d48e19 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
index 8dffab00f89..4586255f5d4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 6c2c4c4b77b..d68c41bbaef 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PG_Object_Group.h"
#include "orbsvcs/PortableGroup/PG_conf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index fa6173ad06a..9957b044b7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
index b1e5cf40dad..ef2acaa24ea 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index e74a5d11f27..d7996e32488 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 56f9c43973e..06837541c94 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 2b66804cf46..4e73825d981 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/GOA.h"
#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
index 5d7a25aaa63..2fb3788fb90 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PG_Utils.h"
#include "tao/MProfile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index 414b3a1ccaf..e3555148867 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 51915a2a5b9..4fd1aabc5d6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 93a040194ea..2ff05ec9706 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index d23f4f3366c..ed7036f2259 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 1df45aa6f91..225346a2fa5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/Portable_Group_Map.h"
#include "tao/ORB_Core.h"
#include "tao/TAO_Server_Request.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 22aae4554e0..5b26d25596a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index a8d0ddcf434..8a4113bcbdd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -1,6 +1,4 @@
- // $Id$
-
-#include "orbsvcs/Log_Macros.h"
+ #include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 5063badd746..0f810879769 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 39c99d3cc3d..a2eeaa473e3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index 2f4ba24ee23..465b82b3e27 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
index 04229fa4c30..ada29cd487f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.h"
#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
index 497055b8cda..71de66ca660 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
index f0e54571e83..54a4d77aad0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 673f4ed2a92..f41d5f3116a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 307822d3fe0..e156ec4c373 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
index 8f1ebd3cc21..c72f45795f1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h"
#include "orbsvcs/PortableGroup/UIPMC_Mcast_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 38d39c17e91..a539bfecc1d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h"
#include "tao/ORB_Core.h"
#include "tao/Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
index c376b17438b..c9ae98313b7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/PortableGroup/miop_resource.h"
#include "orbsvcs/PortableGroup/miopconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h b/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
index 15494956536..54a65b92cc7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/portablegroup_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_export.h b/TAO/orbsvcs/orbsvcs/Property/property_export.h
index 7013fca3a56..98e798a8efd 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
index 593f9bc7d37..9227b6f9af6 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
index 60a4aa4fe46..4808476dd2c 100644
--- a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index c6b69d03d16..7d9cd252de0 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTCORBAEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtportableserver {
sharedname = TAO_RTCORBAEvent
dynamicflags += TAO_RTCORBAEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 170b7970027..c74dacd4a1a 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent) : orbsvcslib, orbsvcs_output, install, svc_utils, tao_versioning_idl_defaults {
sharedname = TAO_RTEvent
idlflags += -GT -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 5ccb28ebc3b..c76704f4745 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEventLogAdmin_IDL) : orbsvcslib, orbsvcs_output, install, dslogadmin, rtevent, tao_versioning_idl_defaults {
custom_only = 1
idlflags += -Wb,stub_export_macro=TAO_RTEventLog_Export -Wb,stub_export_include=orbsvcs/Log/rteventlog_export.h -Wb,skel_export_macro=TAO_RTEventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/rteventlog_skel_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
index a7031f0c0de..3493dcc67ca 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent_Serv) : orbsvcslib, orbsvcs_output, install, rtevent_skel, svc_utils, messaging {
avoids += ace_for_tao // Requires ACE_crc32
sharedname = TAO_RTEvent_Serv
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index e9f5730760b..0d53cb72298 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portableserver {
sharedname = TAO_RTEvent_Skel
dynamicflags += TAO_RTEVENT_SKEL_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 799823b6ce9..9d8400c0ae6 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTKokyuEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched, kokyu {
sharedname = TAO_RTKokyuEvent
dynamicflags += TAO_RTKOKYUEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index 7020e3ce481..9a2251ba3b7 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSched) : orbsvcslib, orbsvcs_output, install, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
sharedname = TAO_RTSched
idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index eae25696612..9d884976c1b 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RTSchedEvent) : orbsvcslib, orbsvcs_output, install, rtevent_serv, rtsched {
sharedname = TAO_RTSchedEvent
dynamicflags += TAO_RTSCHEDEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index 62da7d7d9bb..9ea30f98a66 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(RT_Notification) : orbsvcslib, orbsvcs_output, install, rtcorba, notification_serv, tao_versioning_idl_defaults {
sharedname = TAO_RT_Notification
idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RtecBase.idl b/TAO/orbsvcs/orbsvcs/RtecBase.idl
index 193e6f65299..a767c3f920f 100644
--- a/TAO/orbsvcs/orbsvcs/RtecBase.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecBase.idl
@@ -1,4 +1,3 @@
-// $Id$
/**
* @file RtecBase.idl
*
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index ddbbea4405a..31de8afa157 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_RTEC_SCHEDULER_IDL
#define TAO_RTEC_SCHEDULER_IDL
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 89c1f23dd27..f90a7ee5404 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Runtime_Scheduler.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
index 375cd3450d1..a22952b17a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
index 1e7a4804c0f..932159fd9ed 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index ba594109fd4..f920fe33b4a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index c722e802ca9..353c0b82c9d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
index ab121b2166c..03f8216ea7f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 306896b9bcc..e357aade7c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index 1f8364db77a..e8842aa4a16 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d4e3c1a1dd7..49233b8b01d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 589439db114..99828bd5367 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connector.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index ae78b5fe44b..ea8462ccf68 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
#include "tao/ORB_Constants.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 32baeec78bd..05984766838 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 07bbe863916..c3f4ae47e22 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 601bc8e52fb..c0141239c3f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 9fafd66c03c..0f213596e92 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
index 8768012be44..fa555ada8bd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
#include <openssl/x509.h>
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index ed02368b472..278c6aa27a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
#include "tao/IIOP_Endpoint.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
index 806577d0855..1ad1fe128f3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 0e03de8a1a5..d2197af7fc7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Factory.h"
#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index f0006fd8958..e6506e6dc01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index fab500c1f4d..0c1db080bad 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
index f20eb554f4c..0111b7f02ba 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP
#define TAO_SSLIOP_OPENSSL_ST_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index bd2cd76bdbd..8604d6ba2cb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index f9532b3596c..bed025cbb60 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
#include "orbsvcs/SSLIOP/ssl_endpointsC.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 9090daa0e77..fff54f524b9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 46d0b64bcc5..43db7edd65a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 33b43104058..ae00e1548a4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
index d06b1bf8923..50e7e290648 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MFC style projects on MicroSoft compilers require CPP files
// They can't cope with c files (as MFC projects are CPP by
// there very nature). Some other platforms incorrectly can't
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index d5142543382..38aab1e781d 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef ACE_CONFIG_SCHEDULER_H
#define ACE_CONFIG_SCHEDULER_H
diff --git a/TAO/orbsvcs/orbsvcs/Sched/sched_export.h b/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
index 422a13eed9a..0d4cc9e02e8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/sched_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 3e5492f41b9..c894c027050 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "ace/Singleton.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index e9dcddf977e..cb09a8fdabf 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Scheduler_Utilities.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index c50a6a01559..5918d69960e 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Security) : orbsvcslib, orbsvcs_output, corba_messaging, install, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults, svc_utils {
sharedname = TAO_Security
idlflags += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
index 8ee9ee108cd..0b781ebc61c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/CSI_Utils.h"
#include "orbsvcs/CSIC.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 1519307d289..99e681eb61a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 0aa7c3d65c4..9d41415ebd2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL2_QOPPolicy.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 382f6570613..db6d6e756e5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Security/SL2_SecurityManager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 41fde030644..525dcf71228 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 380cd4f9263..3cd971c403d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 547af03b869..82d65bfe788 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_CredentialsCurator.h"
#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index f1940488326..f8f99982eff 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 129ce8fca7f..2bdacf03186 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_PolicyFactory.h"
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index a31cdef7d67..582564c8aee 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityCurrent.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index 77208fa2c9e..2dfaeb1645f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 7dee871bd4a..a0cc037bf31 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Security/SL3_SecurityManager.h"
#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 296197f3334..8ea7bb61737 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_Current.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index 6627d37f847..0a6350f675f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_Current_Impl.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 273205b9201..750dcdf32bd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Security/Security_ORBInitializer.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 9462e58aa60..d377562f262 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Security/Security_PolicyFactory.h"
#include "orbsvcs/Security/SL2_QOPPolicy.h"
#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/security_export.h b/TAO/orbsvcs/orbsvcs/Security/security_export.h
index af588c4850a..2e93f74d964 100644
--- a/TAO/orbsvcs/orbsvcs/Security/security_export.h
+++ b/TAO/orbsvcs/orbsvcs/Security/security_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
index 018e6daf69b..6532f0e3815 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel3.idl
@@ -5,7 +5,6 @@
// Copyright (C) 2001 Adiron, LLC.
// All rights reserved.
// ----------------------------------------------------------------------
-// $Id$
//***********************************************************************
//***********************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index a85bd530c09..e9f076139da 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Shutdown_Utilities.h"
#include "orbsvcs/Log_Macros.h"
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
index 2663a13d407..6f8d682a822 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -4,8 +4,6 @@
#define _SHUTDOWN_UTILS_H
#include /**/ "ace/pre.h"
-// $Id$
-
#include "orbsvcs/svc_utils_export.h"
#include "tao/Versioned_Namespace.h"
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 78a46f3eac7..6f7018b328b 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Svc_Utils) : orbsvcslib, orbsvcs_output, install, portableserver, tao_versioning_idl_defaults {
sharedname = TAO_Svc_Utils
idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 94afc1b68c8..6336278865f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Time/TAO_TIO.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index eb61b4ce5f8..a87bc724459 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 5d413b0b0e4..d9fdf300e57 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/TAO_UTO.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 2c40eb6e7bf..d3fb66a6287 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "orbsvcs/Time/TAO_UTO.h"
#include "orbsvcs/Time/TAO_TIO.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 94e13e46de9..3264a707ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Log_Macros.h"
#include "orbsvcs/Time/Timer_Helper.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_export.h b/TAO/orbsvcs/orbsvcs/Time/time_export.h
index 53e8ff6bf74..14994d9a3a6 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h b/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
index 58ea4bb5dce..772743b6161 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h b/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
index 736fcf1456b..0817d82868d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Time/time_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/TimeService.idl b/TAO/orbsvcs/orbsvcs/TimeService.idl
index aa4259e9217..46335b8f1fc 100644
--- a/TAO/orbsvcs/orbsvcs/TimeService.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeService.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_TIME_IDL
#define TAO_TIME_IDL
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index 17224e40735..aa6bc96b982 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Time_Utilities.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
index 49315926748..d98246f4b90 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Time_Value.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 1f0cd227d4b..5205633818b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Interpreter.h"
#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Tokens.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 41eef2b6963..8ea8c4946c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Nodes.h"
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Tokens.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
index a40ff4d15da..800d6f6ba13 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef CONSTRAINT_TOKEN_H
#define CONSTRAINT_TOKEN_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 2eb72025297..8772fbd39d4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "orbsvcs/Trader/Constraint_Nodes.h"
#include "orbsvcs/Trader/Interpreter_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 26aac49da64..fb982f6a424 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 6dcd797dc16..cb4632d1a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter_Utils.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 6e7c39acff6..db0a07ec5cd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_INTERPRETER_UTILS_CPP
#define TAO_INTERPRETER_UTILS_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
index bbef8857006..e4b33dfc15b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#ifndef TAO_INTERPRETER_UTILS_T_H
#define TAO_INTERPRETER_UTILS_T_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index d964707da75..9e1246a55a1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OFFER_DATABASE_CPP
#define TAO_OFFER_DATABASE_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 43fdd82e222..465445a518b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Offer_Iterators.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index a1b62b70615..e98e2905485 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_OFFER_ITERATORS_T_CPP
#define TAO_OFFER_ITERATORS_T_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 39868924521..dfa174fb656 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Service_Type_Repository.h"
#include "ace/Lock_Adapter_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 9f7096d9df8..3d36b2862af 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader.h"
#include "orbsvcs/Trader/Offer_Iterators_T.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index f7876eab178..28c928f070a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 90b09d487da..a3720f2efab 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_INTERFACES_CPP
#define TAO_TRADER_INTERFACES_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 5613f3a26ac..2c613786e29 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_CPP
#define TAO_TRADER_CPP
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 75b59671a9f..c6c8a5bac55 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 9d1e8667262..c321b73ab89 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
//===========================================================================
// LIBRARY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index aab21dbcb97..0eae04554d0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
// ===========================================================================
// FILENAME
// Trading_Loader.h
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
index 079cf570be9..d938b2c881c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
index 187f4ab03cd..7ab7e2e8957 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_serv_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
index 3b0f399cef9..a05787754da 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/trading_skel_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index 34b115a7633..04db73d2d4a 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_SFP_IDL
#define TAO_SFP_IDL
diff --git a/TAO/orbsvcs/orbsvcs/svc_utils_export.h b/TAO/orbsvcs/orbsvcs/svc_utils_export.h
index 3f004359ae4..87ff1e9107a 100644
--- a/TAO/orbsvcs/orbsvcs/svc_utils_export.h
+++ b/TAO/orbsvcs/orbsvcs/svc_utils_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 2376ebf01d5..70f4fe30cee 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index eb1cdae5378..784043e9fc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/OS_NS_stdio.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index add4328dc42..1a3227e308a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 57ce03b9cae..72507316dc3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ORBInitializer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
index 9a897e2a30d..fd8ce0985b6 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*Performance_IDL): loadbalancing, strategies {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 64b74b48366..15b264d3e34 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 7e5fc2084e5..a2d731ec00a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RPS_Monitor.h"
#include "ServerRequestInterceptor.h"
#include "ace/UUID.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 7fba1a65442..15e2c5152ca 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/OS_NS_stdio.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index 9acee119ccd..2af202455c5 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ServerRequestInterceptor.h"
ServerRequestInterceptor::ServerRequestInterceptor (void)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 43a589e0c16..d9339f79429 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index b63cdad8681..55fe8e4641f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ORBInitializer.h"
#include "RPS_Monitor.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
index 3153f04339d..882c6b28f0a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 420805af0bc..77f774eeef6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
index e660f7a0898..a63f688dcac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 18e173ad97f..1720871c44f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 6a4e11c00f9..7c7e0fbe6cc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
index 58137c53ff8..ee8faf6618e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index d45fea1df25..3eb381fbc20 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Roundtrip.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 7fb19a396fc..44cc2c67df1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "RIR_Narrow.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index ec0709c89f3..946e204ead7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 5aa0fa496d7..14ed3bef69e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "Implicit_Deactivator.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
index 9123c061fc8..14389ee98d1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*IDL): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index b4197076226..fa37c2c2ee1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session.h"
#include "Implicit_Deactivator.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index b661e16884b..d33346276e0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session_Factory.h"
#include "Session.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 40a34cb65f9..76ac8596c38 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Callback.h"
#include "RT_Class.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 2330cc8bf77..5eda28852ec 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Session_Factory.h"
#include "RT_Class.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
index 0385a920b36..c171f2e6129 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index d0368c3eca6..d29ccb9964f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 22f9e9ac5fb..d9b23ee999f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ORB_Holder.h"
#include "Servant_var.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
index e660f7a0898..a63f688dcac 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): orbsvcsexe, rtcorbaevent, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
after += RTEC_Perf
libs += TAO_RTEC_Perf
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index ae100a2c5ec..d9ab67712a4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "Client_Options.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
index 8fe531f77bb..e23103a243a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Class.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
index 7dea662571a..fe3f2a7b1a5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(RTEC_Perf): strategies, rtcorbaevent, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_RTEC_Perf
idlflags += -Wb,export_macro=TAO_RTEC_Perf_Export -Wb,export_include=rtec_perf_export.h
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
index 7a32929cf47..4182dfeb960 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/rtec_perf_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
index 7d7a080db9c..43c0a3036a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/AVS_Asynch_Three_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index f7d4b3647d6..edf9b208740 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/AV/Protocol_Factory.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index b9c2be19ed8..768ec577f22 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index a6c21d897ba..535103b0a75 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/AVS_Bidirectional_Flows.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index f82c7d54ce7..87785bb6e65 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 9eef99a23e7..7ffb5d8cdf8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
index 09123c1dc14..9e0f86eac49 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/AVS_Component_Switching.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe, strategies {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 91f32a04855..d96e98353b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 71e9e320dc4..49d8fc18d9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 36bcc66f281..d1f0fb0a603 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/AVS_Full_Profile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 2b30cbd763f..d612810bf05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index 5edcd5810ff..ee8214651a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 20113214d4f..808d78b1227 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 5620314dfa8..0901c0e4e69 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc b/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
index e7f0d165f23..6584c385973 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/AVS_Latency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*ping): avstreamsexe, strategies {
exename = ping
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index a1b75c9e6f7..7df40cfa1af 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/AV/AVStreams_i.h"
#include "orbsvcs/AV/FlowSpec_Entry.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index cdac9773b95..b538a2695fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ping.h"
#include "orbsvcs/AV/Protocol_Factory.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index bdc6d955958..9911cbb775a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "pong.h"
#include "orbsvcs/AV/Protocol_Factory.h"
#include "tao/PortableServer/PortableServer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/AVS_Modify_QoS.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 969f03cded6..829afe4ed37 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 4001faf7df4..6d15aa43d28 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
//=============================================================================
/**
* @file receiver.h
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index d84ee471402..337b6154c70 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
index a8567ba6fe6..058cd0d8fec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/AVS_Multicast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe, strategies {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 625778d0a49..7a3d6b003b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
FTP_Client_Callback::FTP_Client_Callback (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index f01e1bad8bc..ca1ffbe22be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index ca5a98725f1..707c54a2bc7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
int done = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index c228fda780d..a20ed2ce30b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/AVS_Multicast_Full_Profile.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index a92bef825b8..b6fbd0d655b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 060c1eef8fc..7144b72f254 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 9fa41e91af8..568822bd25d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server.h"
FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 616cbc1025a..5cec3a1236f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
#include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
index ff55e80a109..def60bd4f67 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/AVS_Multiple_Flows.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index ed83dcfa98f..15f68fb1acb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 32bd1714fa4..07e4c5001b9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
index f18041d3f25..0be292881eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/AVS_Pluggable.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): avstreamsexe {
exename = server
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d73d81073d2..eed33815360 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ftp.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 5f4586d2548..27c0cc9c762 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -1,7 +1,5 @@
-// $Id$
-
#include "server.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
index 35695e3c38d..8d1f4f6bbe7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/AVS_Pluggable_Flow_Protocol.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*ts) : orbsvcslib, portableserver, avstreams, naming {
sharedname = TAO_TS
dynamicflags += TAO_TS_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 9f6c885497e..ddae3e4cee1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -3,7 +3,6 @@
#include "ace/High_Res_Timer.h"
#include "ace/OS_NS_strings.h"
-// $Id$
//TimeStamp Protocol Object
TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index 0e773d911fc..f940cb1133a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -10,8 +10,6 @@
#include "ace/Service_Config.h"
-// $Id$
-
class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
{
public:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
index 13156aa6e0a..085f6cdbb82 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index e4c9cb5470e..4cf2470a51c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index dc27a8990d5..4c365693942 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
index 7f39cd838ea..412fd5fa003 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/AVS_Simple_Three_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 5d4fd10e67f..1efe0bb67a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "distributer.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/AV/Protocol_Factory.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 369f3b60114..c5d8103778f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 8ed65fffbe6..f18d1b04631 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
index 8e3c9bc31fd..e27166a9ebb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/AVS_Simple_Two_Stage.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe {
exename = sender
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 504052e660f..26ad37fdce5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Receiver_Stats.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
index cb317ac779b..6dda78254f7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Receiver_Stats::Receiver_Stats (void)
: samples_count_ (0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 534a008c52f..d1ee8185118 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index b8b2d490899..01cf1610ffa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
index 56c33140d0e..9a6057526ec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/AVS_Simple_Two_Stage_With_QoS.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*send): avstreamsexe, qos {
exename = sender
Source_Files {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index fea8a5ee562..a4b8f17c4d0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "receiver.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index aad582183d1..00d85f7ce1d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "sender.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
index 426eef66b46..6a18046fbae 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): namingexe, portableserver, bidir_giop, utils, avoids_corba_e_micro {
exename = TimeServer
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
index f0a87b1dc8c..84d35e72695 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl
@@ -1,4 +1,3 @@
-// $Id$
module TimeModule {
struct TimeOfDay {
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
index f256645266b..b2b20b0c84d 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1334_client) : namingexe {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
index ecf5bd1deb9..2f159e07481 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, ifr_client {
exename = client
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index ff3463de8db..46fc9e4d5d0 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/ORB.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
index 6a537e0a8d9..0a6298f7f43 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
index fff2e17959a..6510eb4b56c 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
long try_and_create_POA ();
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index 9f0afee75c3..638a1f4fdaf 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_i.h"
// In case this is a static build we have to force
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 03952a5d946..cc58a7f592a 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined BUG_1395_REGRESSION_TEST_I_H
#define BUG_1395_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 506f0220319..8c7cb5f2b56 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 383d446bfcf..5873276dd90 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl b/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
index 28796f76c3c..7e1b03e90e1 100644
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface test
{
void testme ();
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 488d969324d..0426f182a17 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Bug_1630_testclient ) : taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, ifr_client {
exename = testclient
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
index 47a3dc1979e..9b0b5abdfc0 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test): taoclient, messaging, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
index a48dab43f20..38907d6b9f8 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ORB_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc b/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
index 73eec09226d..42fa3c9a9f7 100644
--- a/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2112_Regression/Bug_2112_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver, messaging {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
index f59d039f530..e0ab3b5c441 100644
--- a/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2112_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "tao/corba.h"
#include "tao/TimeBaseC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
index 164917d0a85..691fa233a75 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, ftclientorb {
Source_Files {
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 1d3c0dac05e..f4ead0a697b 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/corba.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
index c1e98ab7f9f..01a5460b8e7 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index bb65e65d76b..511c16107ea 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BUG_2247_REGRESSION_CLIENT_I_H
#define BUG_2247_REGRESSION_CLIENT_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 3b87dbd6560..ee0007dd5bc 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Manager.h"
#include "Client_i.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 05b1f719326..540af93a4ae 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef BUG_2247_REGRESSION_MANAGER_H
#define BUG_2247_REGRESSION_MANAGER_H
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 95d4bc297a8..7b1749f6094 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 8d11653386a..a756c0ffed4 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index 12f537ff77f..d19daef2f93 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2247_REGRESSION_TEST_I_H
#define BUG_2247_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index e8b7128836d..746946abbaf 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index fe9454b050f..ab461eda26e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index c56953b89a6..0795ed687ce 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PI_Server/PI_Server.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index c45ace22ae6..2e3634eef67 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "client.h"
#include "Client_i.h"
#include "testC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index fd2ebcea20c..f8241ccd2f4 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2248_REGRESSION_CLIENT_H
#define BUG_2248_REGRESSION_CLIENT_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index cabcf8fbc13..b029a16325a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "Server_Request_Interceptor.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
index 0dea64769bd..6e73cc2d45d 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Simple_Server
{
string remote_call ();
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index 68966fa125c..0a5dbbadef1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index f4873fc8871..392ba9fcdea 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef BUG_2248_REGRESSION_TEST_I_H
#define BUG_2248_REGRESSION_TEST_I_H
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
index a1be42b8619..1c47f47cd78 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/tests.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableInterceptor.pidl"
#include "tao/PI_Server/PI_Server_include.pidl"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
index b13fc2104be..517408101d4 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index b5d5b8e6d6e..27b6c365b28 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -1,4 +1,3 @@
-// $Id$
// -*- C++ -*-
#include "ServerRequest_Interceptor.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index 655ddbf58fb..c2425cca81a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 0ae6bcb47a9..ead055e510d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 1c3a986f0c3..949c7fe30e2 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 1dae1234895..53cdb4e4ec8 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index b29fc630c62..2ff69131f4b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
index 4138843a913..fc0268a0a76 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index eacb684044c..ef1519b4a3d 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index 894f0b52923..43d8a6a7c1e 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 58a197d2436..9b996a3abb6 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
index 15de5d453a6..7f9e26b8e7c 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
index e79f3b87281..710575bd17d 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
index 3c62609cc72..a495edb4b0e 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
void Server_impl::shutdown ()
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index cf80fb9115d..6823035d916 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
index a4eb0d418c6..552fbf18e45 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
index 5f02be738fa..7da5d7d8101 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
index 9847c190876..967133f6d18 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test) : orbsvcsexe, portablegroup, portableserver {
exename = uipmc_test
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
index 30465b13f50..fc0364928eb 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
index 4275aecbd97..b0bf27772f3 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 74d342ba8ab..25eac5e2ed5 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 2632105c7f5..a70b3b6b156 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestS.h"
#include "ace/Get_Opt.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index 7da2b3117cf..cf624587455 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/IORManipulation/IORManip_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
index 8b625257879..bc504db7277 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, fault_tolerance {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index a15d4b348e9..6fe6f190c88 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "Client_Task.h"
#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index a94e38cec90..fdaebf1da66 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 3b0274328ea..eaa5b66865a 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "TestImpl.h"
#include "Server_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
index 027e6dd0a2e..881b0dddb18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Task.h"
#include "ace/Manual_Event.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
index 57202e9372e..654ce5fee9c 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Test.idl
@@ -1,4 +1,3 @@
-// $Id$
// Just need this for standard includes - contents irrelevent.
interface Test
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index 08916607cda..f0be3e754a6 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "TestImpl.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index 0573e057c49..6e31010ec83 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "TestS.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index a0d24d81fc1..783d061e8fe 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "TestImpl.h"
#include "Client_Task.h"
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
index d5170de178d..680902b1a66 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestImpl.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
index 0ac923d77b9..1abfd2dbc03 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Bug_2800_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
index 8b92aae35ac..519524c7afd 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
index b82ec5dbf88..0fb3a5dd383 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
index 567d1fd0e70..ba73cb16178 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NsShutdown.h"
NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
index d3f2259fc2f..fe585143468 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index 3eabba2654e..444ace92c12 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "Hello.h"
#include "NsShutdown.h"
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 5671046c545..a0dc4495e41 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc b/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
index b72dbc872b0..24a4119ce14 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Bug_2925_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): orbsvcsexe, portablegroup, diffservpolicy {
IDL_Files {
Hello.idl
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
index 30465b13f50..fc0364928eb 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface Hello {
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
index 4ca7b20773f..8bfff7b7d92 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Bug_3215_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
index 6f9554e3515..cb01b6ce8e3 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor2.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index b05a8f66f3c..5b6e3eb3f15 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Ensure that the PI library is linked in when building statically
#include "tao/PI/PI.h"
#include "TestS.h"
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index db81c1d7630..3c1da0dded8 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc b/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
index 09375538ff5..44a5a349497 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Bug_3216_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index e4bc728b877..e2c58cf865d 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ServerRequest_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index 0ce579a79e2..00e9c7af65e 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// Ensure that the PI library is linked in when building statically
#include "tao/PI/PI.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 6aa822e5431..4600310435b 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc b/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
index 50536d4a2ca..87e93776896 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Bug_3387_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): taoexe, portableserver, namingexe, notification_skel {
Source_Files {
StructuredEventSupplier_i.cpp
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
index 2cafdc5041d..df3027a9c49 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger.idl
@@ -1,4 +1,3 @@
-// $Id$
// messenger.idl
interface Messenger
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
index 06de5daa53a..7cf1bdd9bc1 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
index 74f821455e5..a6575d05a1e 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
index 47d9f348342..5095a179afd 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index ceb378aefae..d17f53abbe8 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
index 4edfe313641..561676e19d7 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef MESSENGER_H_
#define MESSENGER_H_
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
index df513d49278..053fb8d0f34 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEventConsumer_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
index 9be7bc4cbdc..1b5912e316b 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef _EVENTCONSUMER_I_H_
#define _EVENTCONSUMER_I_H_
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index 24a2c4424a3..b11df7abb34 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "StructuredEventSupplier_i.h"
#include "tao/PortableServer/PS_CurrentC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
index 376fb3873c7..152a368249e 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
#ifndef _EVENTSUPPLIER_I_H_
#define _EVENTSUPPLIER_I_H_
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc b/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
index 37636b16817..4b117b0bbea 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/Bug_3418_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*) : taoserver {
exename = Test
diff --git a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
index ad01818d727..5f85729628a 100644
--- a/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
+++ b/TAO/orbsvcs/tests/Bug_3418_Regression/Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/corba.h"
#include "ace/ARGV.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc b/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
index 3cb30415b76..9316001f39d 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Bug_3444_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
index 32ec9db32c9..acb2b6a1aea 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
index 5773b0d7be3..d4ee0cdc8a1 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
index 2201809a698..1fe5ec980c9 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
index a1017e32240..34e9ae8b7a4 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
index 7e8d81fbd08..db1b3a6a5ea 100644
--- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc b/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
index e7134e3c6bf..aba79d896f6 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/Bug_3486_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3486
dynamicflags += BUG3486_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
index 8a5b304e171..6be97192212 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
index e630ab370be..f47fe24306d 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h b/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
index 2b3b25ed078..40afd6fb48c 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/bug3486_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3486
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
index 6da6a2ea136..b35654f41c2 100644
--- a/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Naming/Naming_Loader.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc b/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
index 63b37d20812..8129eeadb08 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Bug_3598b_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -Sp
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
index 8c25c69b51e..3c88fae18c2 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ClientRequest_Interceptor.h"
#include "tao/CORBA_String.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
index fe0146360f8..c214c911fcc 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/PortableInterceptorC.h"
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 2017e62d471..90979bacc9f 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc b/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
index 0ac923d77b9..1abfd2dbc03 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Bug_3673_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
index 8b92aae35ac..519524c7afd 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "orbsvcs/Naming/Naming_Server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
index b82ec5dbf88..0fb3a5dd383 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
index 567d1fd0e70..ba73cb16178 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NsShutdown.h"
NsShutdown::NsShutdown (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
index 2c7da5f61d3..cc4ea47298a 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index 3eabba2654e..444ace92c12 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "Hello.h"
#include "NsShutdown.h"
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
index 5671046c545..a0dc4495e41 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc b/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
index 953f52f8c53..9d88a13b790 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/Bug_3891_Regression.mpc
@@ -1,5 +1,3 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, avoids_corba_e_micro, imr_client {
}
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
index 88736989e5d..87d6eb3cdae 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestS.h"
#include "tao/Stub.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc b/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
index 4ec881e0b26..bfe192d2b21 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/Bug_4080_Regression.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
//
project(*IDL): taoidldefaults {
diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl b/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
index 5dcd0d25041..110f4e06635 100644
--- a/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
+++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
interface UIPMC_Object {
oneway void process ();
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
index c89940b5559..6c69d0c40da 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Naming_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
index fdfcba3226d..ba73b4a8f06 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "NamingTask.h"
#include "tao/Version.h"
#include "orbsvcs/Naming/Naming_Server.h"
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
index 81ce69fb80b..9064ea21d21 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef NAMINGTASK_H
#define NAMINGTASK_H
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
index 95e4325db81..9b72cfaecad 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Server_Task.h"
#include "TestS.h"
#include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index b8156f3dba6..7fbc5c0a2af 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/* A Bison parser, made from CC_command.y
by GNU Bison version 1.28 */
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
index 72731e96919..ef7637ec990 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.h
@@ -1,5 +1,3 @@
-// $Id$
-
typedef union {
CC_Command *command;
CosConcurrencyControl::lock_mode lock_mode;
diff --git a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
index e2242dffa83..8cb9efec456 100644
--- a/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
+++ b/TAO/orbsvcs/tests/Concurrency/Concurrency.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CC client) : orbsvcsexe, concurrency, naming, svc_utils, iortable, portableserver {
exename = CC_client
}
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
index 85a9ef71ef9..4feaf617e78 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/CosEvent_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Disconnect): basiceventtestexe {
exename = Disconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index e2bde895acb..6ef684dc6cb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index b17aca95c9e..bcb8dfb4c0a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_Disconnect.h"
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index d3d9825a637..5310576888a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 415f034369c..72008720fa6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 5f04dc9119c..e683a8be7c9 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Random.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index fa4eba583c6..d404a69e6c5 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/CosEvent/CEC_EventChannel.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index 09866f67af3..1995a03bc09 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestEventConsumer_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
index 1672e88303c..67010b8eaf6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef TestEventConsumer_i_h_
#define TestEventConsumer_i_h_
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 83b687dc51a..15a23d002cf 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestEventConsumer_i.h"
#include "orbsvcs/CosEventCommC.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index 4141fc73a6e..4ed805225d6 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(CosEvent Test Lib): orbsvcslib, event_skel, svc_utils, iortable, portableserver {
sharedname = CECTests
dynamicflags += CEC_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index cf49bf0f69b..2a800d6cd5a 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 841d66408af..6032d54f33a 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h b/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
index e583040b361..8fe792490f4 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/cectest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 645249e32af..685fcba8db5 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECM_Consumer.h"
#include "ECM_Data.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 43136a67049..1294bcf411b 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
index a6a580f0a65..d44792d6a43 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECM_Data.h"
#include "tao/CDR.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
index 33218253383..ca7fb1e9fcb 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 5e85a0ee5d9..9c0adf80b8c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index cf6cedf110a..adaf3a06890 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index a73bce90105..ff6da66afa2 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): rteventexe, rtsched, naming, iortable, messaging {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index f4bbba4a267..6070cb41ea0 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "AddrServer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index df931b22a8b..59c1545b7a1 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef ADDRSERVER_H
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 4f6034189b0..9874912832e 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Consumer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 00001f37d6c..a3f09d10e17 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef CONSUMER_H
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
index 73788961680..038e2ae4237 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/EC_MT_Mcast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging, strategies {
exename = MCast
}
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index d4c4d253821..9dcad7cb70e 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Adapted from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Consumer.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index ad2d5afda4c..c0e4a5641a7 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index dca5f9b3d8b..3f131c1d4fa 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -1,4 +1,3 @@
-// $Id$
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#ifndef SUPPLIER_H
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 10b0777b219..ed75cb23729 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Mcast.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 52437fb8233..944e88002da 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
index 76d669aa442..6cebb48fc0c 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_Mcast): rteventexe, rtevent_serv, messaging {
exename = EC_Mcast
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index e7e6a91b20d..d254b7c1773 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Multiple.h"
#include "Scheduler_Runtime1.h"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 01e9f46e4f4..9ba503ad3fe 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
index fc410ce421e..b080fb8175d 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(EC_Multiple): rteventexe, rtevent_serv, rtschedevent, naming, iortable, messaging {
exename = EC_Multiple
}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
index a6de5dd6f1d..468d98c49cb 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
index 44b87de3f80..07979d4501c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
index 86089e80ff4..8919b8f99b8 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 9760a470f11..b81e9af1c92 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Consumer.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index b87e5707fde..61afa504683 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 1f801efd880..f61723b3279 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Consumer_Driver.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index fa8121e15da..9732e3d4558 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index d97704bf08a..20d679e4bd2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Driver.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index f629bfbcae4..1d8a800c539 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
index 591904a2129..ab48e18defe 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
@@ -1,7 +1,5 @@
// This file was automatically generated by Scheduler_Factory
// before editing the file please consider generating it again
-// $Id$
-
#include "orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos[] = {
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index c9b269f3945..eed3d2b98c1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Supplier.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index ddc36af837d..df062485bc0 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 9810214e280..bcaf9071e28 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Supplier_Driver.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 44ef3755309..960a697e712 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 88cd24961fc..315d6b03e94 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ECT_Throughput.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index e3a3ae718ff..9d2a48261b1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -1,5 +1,4 @@
/* -*- C++ -*- */
-// $Id$
//
// ============================================================================
//
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index ebbb7c450a8..53993798a4d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(ECT Supplier): rteventexe, rtevent, rtsched, naming, iortable, messaging {
avoids += ace_for_tao
exename = ECT_Supplier
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index bc35adba8ca..a9fd87264e1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Atomic_Reconnect.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index e12521fccba..063f5556bf2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "BCast.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 86be16f5328..a74ba7bdbe3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 1607d15d60c..f52fd4dbd35 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 0714f229a4a..3f773a72e5e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Control.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index cb3153210b4..72681c72a93 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
index 7e0cca0b454..6c8420c0686 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
+++ b/TAO/orbsvcs/tests/Event/Basic/Event_Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Reconnect): rteventtestexe {
exename = Reconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index f112f9f6d9a..35965afa1bf 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index a447a99d4a2..41ef8866b22 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MT_Disconnect.h"
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 0ec7aaa6dfe..cede269c38a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index f39b060867f..425b64dcf12 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Observer.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 77a600c59ef..b3b557a1c89 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Random.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index fca70e30dd4..2fdb2af44b5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Reconnect.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index c0461b8125f..335ad144b0c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Schedule.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 7e308b5124d..960ee33ee13 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Shutdown.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 0dd7e45e059..638ea4c3101 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 3dc6d2d4c6a..93eea269c6c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
index 7d8a33bfb38..2fce887c080 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/AddrServer.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Server): rteventexe, rtevent_serv {
exename = server
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index 1ae3cae880d..a741f4f6c52 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/INET_Addr.h"
#include "orbsvcs/RtecUDPAdminC.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index 68d8ae17590..a46f3074570 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// AddrServerMain.cpp
// Main program for a common Address server instance to be shared by all
// event channels
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
index e0ab8b490e4..5400a440bb2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// TestAddrServer.cpp
#include "TestAddrServer.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
index 1f87fb38a7b..a7314f653be 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// TestAddrServer.h
#ifndef TEST_ADDR_SERVER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
index 9c398b58046..4104d6e092f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
index d9c5af671ff..f179d3438c0 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: rtevent_serv {
sharedname = ECMcastTests
dynamicflags = ECMCASTTESTS_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index 4d7b998dd0a..960f03e5911 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EC_Wrapper.h"
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 56b377c7878..09790573f91 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef EC_WRAPPER_H
#define EC_WRAPPER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 943195e2bb9..1163e50c20a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index c749c44b5b3..bbe81ff8729 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -1,6 +1,4 @@
/* -*- C++ -*- */
-// $Id$
-
#ifndef GATEWAY_EC_H
#define GATEWAY_EC_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
index 627efc6ee49..1152f870e47 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*supplier): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
index bc1faae8c3b..0332bc24778 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define A_EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index bc9c677cd1d..ee9c617cff6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
index b08cd796de1..775a4a438c1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index 5cba23a3414..75f2b10d2ea 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 6c01dd0482b..b57aa1d2c18 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumerMain.cpp
// Main program for a PushConsumer of Echo events.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 8708015e3d0..397f37adb0e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.cpp
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 288ce58931c..0417aa89000 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventConsumer_i.h
// Implements a PushConsumer.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index a5d18cf66ab..99e1f474cce 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplierMain.cpp
// Main program for a PushSupplier of Echo events.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index 647b2545ef1..af651e069a4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.cpp
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
index ab93a670215..3cba086c295 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
// EchoEventSupplier_i.h
// Implements a PushSupplier.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index d7958d46f27..b0c06413c38 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Supplier): namingexe, rteventexe, rtevent_serv {
exename = EchoEventSupplier
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
index 12b0a091d2f..b77d1b1923f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.cpp
#include "SimpleAddressServer.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
index 7c192e1c50c..526e7872927 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/SimpleAddressServer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// SimpleAddressServer.h
#ifndef SIMPLEADDRESSSERVER_H
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
index 45bca620bf2..d69e606d269 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define EVENT_TYPE ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
index 627efc6ee49..1152f870e47 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*supplier): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 2738362a2a6..d1ac1fd8127 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
index b011869f364..078ee5f6a38 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index 5148c468c6d..288e98e620e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
#include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
index 6a6919f964d..d298e8b85bf 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Constants.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event_Service_Constants.h"
#define HEARTBEAT ACE_ES_EVENT_UNDEFINED+1
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
index 0c9d100ea8c..1b824a4341e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*application): messaging, rteventexe, rtevent_serv, naming {
after += ECMcastTests_lib
libs += ECMcastTests
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index 3ac17021462..25f0c2f5e48 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Constants.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
index c426e38e928..10de886574b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Gateway_EC.h"
int
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 0413449ccfb..2d8f1b6b350 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Connect.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
index b0df7a26f09..f4f24d2e157 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
+++ b/TAO/orbsvcs/tests/Event/Performance/Event_Performance.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Throughput): eventperftestexe {
exename = Throughput
Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 56f18c95d59..8c949bfcd1e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Inversion.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 12d25b6a41c..d44f1be20cd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Latency.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 9de21e581d9..156656a53a9 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/Event/EC_Default_Factory.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index dddde59bcfa..bc9995de9dc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Throughput.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
index b38aaa13633..bfba4462981 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
/*
* Test TAO_EC_Thread_Flags encapsulation.
*/
diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
index 18bbbbed5e8..476d1d3afe6 100644
--- a/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
+++ b/TAO/orbsvcs/tests/Event/ThreadFlags/tftest.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(TFTest): rteventexe, rtevent_serv {
exename = testflags
}
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 7992bc6f951..e6dc0eababf 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AddrServer.h"
#include "tao/SystemException.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 89dd8c30951..c93d4f6dd0d 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
index 8bbd9069095..7f89b7fc045 100644
--- a/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
+++ b/TAO/orbsvcs/tests/Event/UDP/RtEC_UDP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*idl): taoidldefaults {
idlflags -= -Sa -St
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 1138ba409f4..2180da5fc08 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/RtecEventChannelAdminS.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 2b94d185d48..c33e8119b9f 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "AddrServer.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 3a83d94c10d..19d88f50a89 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "AddrServer.h"
#include "orbsvcs/Event_Service_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index af31c5bd30a..ff6d6ce4c89 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Consumer.h"
#include "orbsvcs/Event_Service_Constants.h"
#include "orbsvcs/Time_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index cf78deb34e1..2c28ecdda5e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 35da042eb61..52ea5d4d378 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Counting_Supplier.h"
#include "orbsvcs/Event_Utilities.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 10347f90360..5b389cac642 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Driver.h"
#include "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.inl b/TAO/orbsvcs/tests/Event/lib/Driver.inl
index f346e7757c1..0a23040f1dd 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.inl
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE int
EC_Driver::verbose (void) const
{
diff --git a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
index 4f3a25927b2..cf48d752239 100644
--- a/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
+++ b/TAO/orbsvcs/tests/Event/lib/Event_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(Event_Test_Lib): rtevent_serv, naming {
sharedname = ECTests
dynamicflags += EC_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 8e0a7ea4629..a1877edb197 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Supplier.h"
#include "orbsvcs/Time_Utilities.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/ectest_export.h b/TAO/orbsvcs/tests/Event/lib/ectest_export.h
index a6e9712d496..383ad6bad3b 100644
--- a/TAO/orbsvcs/tests/Event/lib/ectest_export.h
+++ b/TAO/orbsvcs/tests/Event/lib/ectest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 1c99f00f1fa..ae1ffb5ac3d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, orbsvcslib {
IDL_Files {
FT_TestReplica.idl
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index d220a23984d..9572565a286 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "FT_TestReplicaC.h"
#include <ace/Vector_T.h>
#include <ace/SString.h>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 33c4ae7fdfe..cb90f1cdc6e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/FT_ReplicationManagerC.h"
#include <ace/Get_Opt.h>
// FUZZ: disable check_for_streams_include
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 900a096e73c..1b1eccf7b6e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
/* -*- C++ -*- */
//=============================================================================
/**
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index 893a8bce90a..7aec5868fc3 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
Basic::Basic (CORBA::Object_ptr object_group,
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
index 5f8b3f58c4d..ce7b91b0499 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 92086c4ebd8..b2a7b5e77dd 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
index 432ccae5558..5e509d5c117 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc b/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
index eeab5127922..3a782579c18 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Federation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
index 149a73fcce4..883cd040bfa 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
index 777ce44f7e5..eb1707d6755 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "orbsvcs/CosNamingC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 3c11da34eb6..be646b71269 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
#include "orbsvcs/PortableGroup/PG_Property_Set.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 323cd540ddf..603eb0086e8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
index 0c1338cb2fd..5276d5c9b41 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Load_Balancing_Name_Service.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 8bf3f592813..370be8a05a1 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
index 258cddbe1de..36cb74661c1 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc b/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
index d4a8d42c12c..cf246863867 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/Replication.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : ftnaming {
exename = client
}
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 81eef2d3c0c..e8b2620e2a5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = DESCRIPTION
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl b/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
index 34ea5a9e113..90ec1af00d6 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
idlflags += -DCORBA3
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index fe9454b050f..ab461eda26e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_ORBInitializer.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 053d4054198..2ad6b91f3b9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Server_Request_Interceptor.h"
#include "orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PI_Server/PI_Server.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index b10636850e8..ada224e6656 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "testC.h"
// Ensure that the PI library is linked in when building statically
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 428c66100ee..53c65dd74e9 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index a845f0270e1..07ad3876c6b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
test_i::test_i (CORBA::Short num,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
index 4bdf2f07c2b..3365b944bf5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 1d08ce00953..ca44b8bc7eb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index ed8c1b4122d..44b33d9fd24 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
index 18cca059edc..df93f9c5d43 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/FaultTolerance_IOGRManipulation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(IOGRTest): taoserver, orbsvcsexe, iormanip, ftorb, messaging {
exename = IOGRTest
}
diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
index 774382d8d09..012da8cf2ef 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
+++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer): orbsvcsexe, ftrteventclient, strategies {
exename = consumer
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index dd1428179db..fe641135183 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_sys_time.h"
#include "PushConsumer.h"
#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 1be4464c3b5..802d415e6b4 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/Event_Utilities.h"
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 653956af79b..2e4da10e414 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 38239fbc6b7..e1aac398307 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "orbsvcs/CosNamingC.h"
#include "orbsvcs/FtRtecEventChannelAdminC.h"
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 667b818d227..0e3a8ca3df5 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index fe74f720fe2..449144691ff 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index d2bdb7e602e..9a23fdb768c 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index 55c56357743..8b1b5de842f 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <ace/Get_Opt.h>
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index 8b81e46ec7f..8b2779e1a30 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Hello.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index 01fcb2cd41a..84b84d7551e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
MCast.idl
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
index 44e31968528..efc5cfa1d2f 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module MCast
{
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index cc99975fe44..364b5a4c409 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MCast_Server_i.h"
MCast_Server_i::MCast_Server_i (void)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index f325761243f..231b7154fee 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef MCAST_SERVER_I_H
#define MCAST_SERVER_I_H
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index f70cc79d142..5eb4632ea19 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ior_mcast_client_i.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index a9710c25b60..c8a5cdb19f3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ior_mcast_client_i.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 57c6b415f21..67829f3be31 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (IOR_MCAST_CLIENT_I_H)
#define IOR_MCAST_CLIENT_I_H
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index 29d61bc4d7d..d12401d49a9 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 95d01f170db..626dd0d8ef8 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MCastC.h"
#include "MCastS.h"
#include "server_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Airplane.idl b/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
index ecc38afa7c5..2e683179e89 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Airplane.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Paper_Airplane_Server
{
string get_plane ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
index e660b75e889..4b61522e07a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
idlflags += -Sa -St
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
index 2bc3637b34a..57808678d6f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger.idl
@@ -1,4 +1,3 @@
-// $Id$
interface Messenger {
boolean send_message (in string user_name, in string subject,
inout string message);
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
index 3b7d0c625b1..f91e3d3036f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index 8f450801ae1..bc8ddefc337 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Messenger_i.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
index dd804403c50..0cee65e9fe1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Messenger_i.h"
CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
index 0fadc985960..bcedf4b317c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
#ifndef MESSENGERI_H_
#define MESSENGERI_H_
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
index 5a53724088d..6a6201eaed6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Bug_4152_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
index bfa13f84bdb..8a71f966081 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
index 3400c2e8568..d701d0c6ab4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
index 96e5d8502bb..0e5de1cd8e5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
index 8bef96257c0..9403f78d008 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/Bug_689_Regression.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
index 0dd9ad68b58..b3894cc55a0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "bug_689_regression_i.h"
bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
index b215bd5224d..700e4bac6d3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef BUG_680_REGRESSION_I_H
#define BUG_680_REGRESSION_I_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
index 6475eb4fd19..06498e58b33 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "bug_689_regressionC.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
index 85218e307d6..9738d4495e7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/ORB.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index f926d157552..a8fa7f3af1e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(airplane_idl) : taoidldefaults {
IDL_Files {
Airplane.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
index c5a71e0cbca..ab765a05d9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index fe6eb88b04a..6d4dd83b8fe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
index 4528c671079..10f642b8e5a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
@@ -1,5 +1,3 @@
-// $Id$
-
// Just implements a nice little Nestea server
interface Nestea_Bookshelf
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc b/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
index cf4a2b1804a..b87d1eb85fe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/ImplRepo_NotifyService.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: notification_skel, notify_serv, svc_utils, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
}
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
index 681708b8423..c3c2d0fe65a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyCommC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
index 6a20861ee2e..99b46560cd7 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ReconnectServer.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index eb757b80083..ea728fbfe2f 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "testS.h"
#include "tao/AnyTypeCode/Any.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
index d1046f74a6a..9f2ba1008e8 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/idl/test.idl
@@ -1,4 +1,3 @@
-// $Id$
module taoimrtest
{
module reconnectserver
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
index e42e5b9f394..df6ec85f5a2 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "tao/ImR_Client/ImR_Client.h"
#include <ace/Task.h>
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 06f6c1fe2a2..d5776eec110 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ORB_Task.h"
#include "tao/ImR_Client/ImR_Client.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
index 0487df28e12..8d781e5a64d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
index 7348ee24fa9..ff679e82b06 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IMR_RECONNECTSERVER_H
#define IMR_RECONNECTSERVER_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
index 366986b9076..bdbfdeb8cf8 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/RestartIMR.mpc
@@ -1,4 +1,3 @@
-// $Id$
//
// Really the server is the only one that needs to avoid minimum_corba and
// the lot. But there's no sense in building anything if you can't build
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
index 1ff199e5a1d..0c7648f65e9 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/server.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "tao/ImR_Client/ImR_Client.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
index 3e16ed854f5..b29892067a6 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test.idl
@@ -1,4 +1,3 @@
-// $Id$
module Test
{
interface Dummy
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
index 0487df28e12..8d781e5a64d 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "test_i.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
index 4c0e0ef2ceb..3b77ade88cc 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef IMR_RECONNECTSERVER_H
#define IMR_RECONNECTSERVER_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
index 5860f3ef5d6..dd64e39a5e9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger
{
boolean send_message (in string user_name,
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 96bc33660d4..2b765fc66e3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
index 7c9099d475f..13c9135ec49 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// MessengerServer.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
index 71c175c4dd9..29f5df44f15 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
index dec10fef0a1..40efe4f252a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 61cede2ee30..a3292254a97 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_client_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index a10f3868cab..5a258383764 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index a7323cc4414..0da2e262d73 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_server_i.h"
int
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 2a37963f76f..54aec2f16ad 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "airplane_server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl b/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
index ac3641bd6d5..220db0f1724 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
index 04f3cff45e4..b1a7900a604 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc b/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
index aebf08d7ffe..ecbf751f07c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/double_start.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
index b6d02da96ea..5e4a71ad7b6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
index db920a2d270..9db181b2a3a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
index 75e21212960..c2412e04056 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc b/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
index 5ac2135b6b5..e503f89c727 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/kill_server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index dce997ea1a1..556e91f675f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
index bfa13f84bdb..8a71f966081 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
index 03d7c76a827..91d3a73d970 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
index 5a53724088d..6a6201eaed6 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/kill_slow_server.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
index 978852bf41f..8c43ec1ef9d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
index abdddcb2b38..e455d14191c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
long server_pid ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
index 1247543614a..fdf6eb9293d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc b/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
index 39fa2e96965..03ea47cc853 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/link_poas.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 3833faa575b..0f1ea1a0118 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
index 507f97151b5..4b9fb0827fd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "testC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc b/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
index a178cdbfe1f..3cd0f58e9ee 100644
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/manual_start.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
index a6ece057589..1b530343a03 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl b/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
index a51ce7712f4..0e1f3354574 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
void contact ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
index dc1cbfb2509..d670b0ad7c8 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 05a06dc9ca9..406f52b8c10 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_client_i.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index c508ff5f744..4c8b2fde791 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_i.h"
#include "tao/debug.h"
#include "ace/ACE.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index c382406ccd3..f950bfcc84e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_server_i.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index fa4dd224022..5e81ec83a88 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "nestea_server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl b/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
index 855d0afd9fe..6dd6cab10e4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
oneway void foo ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index 29986efd64b..d65dd22c22e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
index 5a758f7cf5d..2d05c7b556d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc b/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
index 1b37ca5769e..4a618c19d08 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/oneway.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index 0ea19b98057..fea63bc3cae 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
index c05ecbf1d64..87f2d592e05 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
index 158a6f6408e..a4d75a5e02f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/ping_interrupt.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
index c266b110909..9bf0ef6eb77 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 6a3f4d0832b..d884c5953d2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_interceptor.h"
#include "tao/OctetSeqC.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index 4f68b5cc8cd..6fc3d865a28 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -1,4 +1,3 @@
-// $Id$
// This is a simple test of an ImR using the corba interfaces
// Start with -orbinitref Test=...
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
index c3f1337cb52..41b656b76a4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index a765c5c1ae2..aef0c6ce98b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
int
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 2ce093714ba..04162699197 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index c8580df203f..1fbf4d27f2b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#if !defined (SERVER_I_H)
#define SERVER_I_H
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/test.idl b/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
index 9ff40e9c6a9..9f1dcab2358 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/test.idl
@@ -1,4 +1,3 @@
-// $Id$
interface test {
long get();
};
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
index de7118f22e8..b38cc18e356 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// Return the number of the server after a delay
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index 49bef759b17..70a05ff6ac3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "tao/TimeBaseC.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc b/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
index e8275b43b9a..57e1f598929 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/scale_clients.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
index a0739c28438..6e14af58b69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
index fc0520fa18e..bcfa43c6ee5 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
// Return the number of the server
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index 92d6c0803bc..b3a046998c2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 2b971eefbff..2a6ad20a2de 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
index 11aab468634..f8b8931b82e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/servers_interact_on_startup.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
index 294bfad5aa7..33bd08b6fa7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 17ed01fa517..7f709cb03cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include <iostream>
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
index 4b3a27efbbd..1ac34448543 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// server.cpp
// This version uses the Implementation Repository.
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
index 5ac2135b6b5..e503f89c727 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/servers_list.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
index aba13d6261e..8c4111ce643 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): taoexe, portableserver, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, svc_utils {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index c579d5e1fc3..1e834114576 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ifr_dii_client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 04f3971aef5..dfc404651af 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ifr_dii_client.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 05ee08d24c8..1431163ea66 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef IFR_DII_CLIENT_H
#define IFR_DII_CLIENT_H
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 8470b696545..1b8fe6b409f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/OS_NS_stdio.h"
#include "orbsvcs/Shutdown_Utilities.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
index 8ac11a758fb..81dfc6c5dbe 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
module warehouse
{
interface inventory
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index f8ba51d221b..c093f9714ca 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "test_i.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 1554203f924..606dd538ee0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "testS.h"
// Must include this header file and link to TAO_IFR_Client.lib
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
index ea322c3966f..a5dc3af54ce 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// The run_test.pl perl script will check for the expected output.
#include "ace/config.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
index 2704eabe9bf..44f6059a4a2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef __IFR_NESTING_ARRAY_TEST_DEFINED
#define __IFR_NESTING_ARRAY_TEST_DEFINED
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
index 30905c16208..eefd4628659 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Bug_3155_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test_idl): taoexe, ifr_client {
exename = test_idl
includes += $(TAO_ROOT)/include
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
index 8230f0955fb..068ec360bd6 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module C1
{
valuetype EB // NOT abstract
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index 19dde458bd5..6bb7e0f1aa9 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/IFR_Client/IFR_ComponentsC.h"
#include "ace/Get_Opt.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
index fa0bd0c8d2d..ef376c8c67f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Bug_3174_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test_idl): taoexe, ifr_client,dynamicany {
exename = test_idl
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
index 0983f644770..2280286b190 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test.idl
@@ -1,4 +1,3 @@
-// $Id$
// TAO579
module m1
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index f75482473fd..c145440b16f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
#include "tao/DynamicAny/DynamicAny.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
index b79db9ce724..f738247d66f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/a.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __A_IDL__
#define __A_IDL__
module wtk {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
index e85ffb03eb2..84e0becd173 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __FMK_B1_IDL__
#define __FMK_B1_IDL__
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
index 0833334ffe1..a83f18f917c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/b2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __FMK_B2_IDL__
#define __FMK_B2_IDL__
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
index 2b7ceedfb83..9e6b22bae86 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Bug_3495_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
index a6763a1a819..87e04510f2d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IFR_Client/IFR_BasicC.h"
// Must include this header file and link to TAO_IFR_Client.lib
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
index 42753283c2b..aaedcb4a1bf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
index c96c22fdd87..49114a42792 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#pragma prefix "omg.org"
module CORBA
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
index dfb837f92a0..aa1a649cc45 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test1.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST1_IDL__
#define __TEST1_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
index 46539e92bd5..23f5ecf0224 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test2.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST2_IDL__
#define __TEST2_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
index 0b6923509e0..9c81f0023e3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/test3.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef __TEST3_IDL__
#define __TEST3_IDL__
module test {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
index c69559d7705..daa4da7f098 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = IDL3_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index a4e9f470c67..11539ae78d5 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "idl3_client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 5bb899c36d5..eab7f237b54 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "idl3_client.h"
#include "tao/ORB.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
index bbb6c86a00e..5b0f1e6f623 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#ifndef INTERFACEREPO_IDL3_TEST
#define INTERFACEREPO_IDL3_TEST
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
index 55d1cb99edb..70b304ef4f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
@@ -1,4 +1,3 @@
-// $Id$
#ifndef __IFR_INHERITANCE_TEST_DEFINED
#define __IFR_INHERITANCE_TEST_DEFINED
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
index 2f15cd2ce87..a63aec0cf43 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoserver, ifr_client {
exename = IFR_Inheritance_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 261138e3244..08cda98f1f4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
// The run_test.pl perl script will check for the expected output.
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
index bd5f0afea22..ff2e8502885 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/IFR_Self_Recursive_IDL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index b2c994851b7..169226cdfe2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/IFR_Client/IFR_BasicC.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 5df03c2b300..2c78cb4a442 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "GoodDay.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index ad8c0363dd7..4f1d5283b33 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Admin_Client.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
index cd458dac258..a6c8ef89db8 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = IFR_Test
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index eec00db242d..7e8af09bf73 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Admin_Client.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index 8ee343888f9..b9353a4913c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Latency_Query_Client.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
index 19fe67004fc..c6809c76f00 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: ifr_client {
avoids += ace_for_tao
exename = client
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index 4e919008a6b..f556b7b9a63 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Latency_Query_Client.h"
int
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
index 2c9a5ad5cd3..0462398e841 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Persistence_Test
}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index b1a5fab848f..c8f86a137ad 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Ptest.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index e55bfc1f40e..7d5829a5a78 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Ptest.h"
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
index 054542a4b3e..7ed4d11e75a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/Union_Forward_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client): taoclient, dynamicinterface, dynamicany, anytypecode, ifr_client {
Source_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
index f57bec82ddf..c3b791947dc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
@@ -1,7 +1,5 @@
// -*- C++ -*-
-// $Id$
-
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
index a09262aae89..ac8020ac93a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module IFR_Test
{
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
index 831fed1a8d3..5b6781319ee 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Interoperable_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, portableserver {
exename = client
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
index fd4436446ba..6d43ddd2382 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 8d733337167..acb1480fcd9 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index 0ffd18e95b9..b269b4cd18a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index a167ce93a54..1366ea41522 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 88bc5f6819e..60136341346 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index eeb61688925..0f7ec95b13c 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
index fd4436446ba..6d43ddd2382 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index c0aede26ecc..86eb6d82c58 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index e7749681cc7..de52cba81eb 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index 546d0c60179..74fe151c85a 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
index 48c4148da67..a3a7a29b677 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
index bcb1292951f..6a6436928ed 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
index 24553e7f9eb..7467943027b 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Factory_Map.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
index 3b9f3ed923c..ce7a817aaa9 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
#include "Factory_Struct.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index a7367b2f44b..cef4b099a21 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_Factory_Server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 6bbc51ac1fc..6febfc8546c 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index feb230318fa..b5ce33978ac 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
index 7de73d898a5..b0c9daac166 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
index e7b491f6c55..749dc735dc8 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_Factory_Server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
index 2158e314e99..825b90899d6 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 5615e8b55cb..8c7b5ca40c2 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
index 99a52abe6ae..057af095522 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
@@ -1,5 +1,3 @@
// -*- C++ -*-
-// $Id$
-
#include "Factory_Map.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
index 3b9f3ed923c..ce7a817aaa9 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
#include "Factory_Struct.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
index df26a140ffe..d24dbfa48ae 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index 8a6c30869a8..6150e701400 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Simple.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index 22d5988dafb..50d02c2d857 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
Simple::Simple (void)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 4b7b468b90c..db548b84149 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
index 85c32ae81d4..96cef266e28 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Factory.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index abf25b3e295..f8d659d18bb 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 1f3f96e5155..ea93044934d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
index d8dcbe0a298..c1d6a1b8999 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Manage_Object_Group.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): orbsvcsexe, portablegroup, loadbalancing, naming, svc_utils {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 6e779f63ad8..5180232ea6e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Simple.h"
#include "LB_server.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 6aeca31a7e0..1fef2a2c27f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LB_server.h"
#include "Basic.h"
#include "Simple.h"
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
index 751fc1454c0..2f91ee8cd6e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Client): loadbalancing {
exename = client
}
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index c3920b4a410..b8ed792c957 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosLoadBalancingC.h"
#include "orbsvcs/PortableGroup/PG_Operators.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 679a469b1a6..3069a36ed76 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic_Log_Test.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
index 3213ff1542c..3c004ba08f8 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Log_Basic_Log_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project : orbsvcsexe, dslogadmin, naming, dynamicany, iortable, etcl {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index d3a01e870dd..ee028fe44c1 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Basic_Log_Test.h"
#include "ace/Log_Msg.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
index d7776aa5691..f52f7ea2240 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module Test {
typedef sequence<octet> Octets;
diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc b/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
index 58ffc92e8ef..5066b917d01 100644
--- a/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/McastFragmentation.mpc
@@ -1,5 +1,4 @@
// -*- MPC -*-
-// $Id$
//
project(*IDL): taoidldefaults {
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
index 71b6551358b..2ef2d5a4ef0 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index d5ad7fbbe78..71b4daec197 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index c29b43793c7..08f366bcb8b 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc b/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
index 71b6551358b..2ef2d5a4ef0 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastLocal.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
index 38b253edba4..64678a3a6e4 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
index c29b43793c7..08f366bcb8b 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
index 3cb30415b76..9316001f39d 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/McastPreferredInterfaces.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*IDL): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
index 32ec9db32c9..acb2b6a1aea 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef _TEST_IDL_
#define _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
index 5773b0d7be3..d4ee0cdc8a1 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
index 2201809a698..1fe5ec980c9 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TEST_IMPL_HPP
#define TEST_IMPL_HPP
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
index a1017e32240..34e9ae8b7a4 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
#include "TestC.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
index 7e8d81fbd08..db1b3a6a5ea 100644
--- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_impl.h"
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc b/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
index b16e0f4fdbf..d1608fd5662 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastZIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Test.idl
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
index f8c640c8681..224d077e9f4 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TestC.h"
#include "ace/Get_Opt.h"
#include "tao/Object_T.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
index 13162aebb44..201b71c6185 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "McastHello.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index a6a95024e5b..a57ff18c887 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "AdminProperties.h"
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index 5acfd2c15ed..faf9411bf1f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Notify ConnectDisconnect): notifytest {
exename = ConnectDisconnect
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 290f38aded1..26893522ce8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 337cdd0bf48..f61f6e17edd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
index 7a7aa3a1a27..c810433a0d0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 882be5d2bf7..0fc5e03747f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 575f3ef3a49..6bbac66f859 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 9b566741411..8d8bb055f34 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/go.idl b/TAO/orbsvcs/tests/Notify/Blocking/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Blocking/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
index 7a7aa3a1a27..c810433a0d0 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Bug_1385_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
index 5616aa1e83e..635350404e1 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
index 3b2206a0a7c..f8582085739 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
index 320d9f2849f..5853851ca20 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
index d900bd56fd6..63e19532fe5 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/Bug_1884_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, notification, notification_skel, naming {
exename = consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
index 8ac58bf4e75..5ef26667930 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index c46fe141bd4..cc8af3b58e1 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 034ff5dcfcd..953f44ea5f2 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 400d97dfea8..821e496afbd 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
namespace CosNotifyCommImpl{
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
index 4c13530d03e..ce56a6d7302 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Bug_2415_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index dabaa4e737f..1ed574aff9d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
index f60e931f900..cb6e8daf637 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Notify_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
index dcff65c1ebd..2628c22c28d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
index 00263764bec..b008d0dd83c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Bug_2561_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
index 8657a7df797..8a8f2e3a0e6 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
index 9ff570e322f..c75a375c65e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Notify_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 956e6538775..d434d603101 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
index f546e2df51a..5ecad9b514e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/Bug_2926_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug2926
dynamicflags += BUG2926_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
index c6eae95b721..17b9cd35d21 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
index d3ada78bcad..db4f00390b8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
index b99136d8a76..99273a2d335 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/bug2926_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug2926
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
index 6f590f1bdef..5be7ee1c143 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify/CosNotify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
index fe66eb5cf6e..c56c45e20f5 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/Bug_3252_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*server): notification_serv, taoexe, threads {
exename = server
libs += Bug_3252
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 135271cae10..524a606b81e 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "DllOrb.h"
#include "ace/Arg_Shifter.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
index 7a307a12eca..4a52e9f0384 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef bug_3252_DllORB_h
#define bug_3252_DllORB_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
index b9ec40223b0..3e34c0cda3b 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/bug_3252_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug_3252
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index ba665d506ce..9e7b4c3e842 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/ARGV.h"
#include "ace/Service_Config.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
index 2c4b8f96405..6757254a0aa 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Bug_3646a_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Cons): notifytest {
exename = Consumer
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
index 061ee286b3a..f79dfe149f7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
index 74fb3b72ee2..da4f3935166 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/Bug_3646b_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3646b
dynamicflags += BUG3646b_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
index fd28cd1d69e..75e5e91adc6 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
index d2f46db4466..f8b9b829f6c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
index cc4d2dc3fa3..cebf11d087f 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/bug3646b_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646b
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
index 2f5932b870c..2a8c410c42c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
index 124f44aef8a..c3186cc0dba 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Bug_3646c_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Cons): notifytest {
exename = Consumer
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
index ad64a1153a1..6536b945fe9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
index 270307d4192..c0eb3b9104c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
index 501440fc990..a0b0054723d 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
index 77bd3473018..0ab4afcd953 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/bug3646c_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646c
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
index b04f8f0b770..78ac583c59a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
index db468aba6ea..fe01b4f6293 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/Bug_3646d_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3646d
dynamicflags += BUG3646d_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
index a8f6848d55b..67bd25ffacf 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
index 65e44829a85..f2df32f6cb4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
index 1db5de2778f..295b9c40c98 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/bug3646d_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3646d
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
index 92c0813c661..7dbb8a1f845 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
index 5e236565e37..ce084bc0650 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/Bug_3663_Regression.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project (*lib): taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3663
dynamicflags += BUG3663_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
index 4eafe04a802..f9d682490a7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
index 16471c71b50..fbd190076d7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
index a83678a7094..484be445440 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/bug3663_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3663
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
index 209cdb31747..f76c8350b20 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
index ee94ec7adb8..3e93854ae8d 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/Bug_3688_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Consumer) : orbsvcsexe, notification, notification_skel, naming {
exename = consumer
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
index 8ac58bf4e75..5ef26667930 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/CosNotifyChannelAdminC.h"
#include "orbsvcs/CosNotifyChannelAdminS.h"
#include <iostream>
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
index 1dc331eb2fb..3c46b033d58 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 647111c3284..50088af13f4 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
index 5d1188492dd..a9771fc9a44 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/Bug_3688b.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (*lib): tao_notify_service, notify, taolib, portableserver, threads, avoids_corba_e_micro, avoids_corba_e_compact, avoids_minimum_corba {
sharedname = bug3688
dynamicflags += BUG3688_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
index ed3197a9021..b7398ba4c0a 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "DllORB.h"
#include "ace/Barrier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
index 4d9a562f20f..d24d61143d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef DLLORB_H
#define DLLORB_H
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
index f65a42384d2..596cb624502 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestBroadcaster.h"
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
index a75caa09996..7c743cbcbd7 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef testBroadcaster_h
#define testBroadcaster_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
index ef196c28fe9..8a1fca47def 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "TestListener.h"
TestListener::TestListener(
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
index 90a5b3f2f88..ee832c1a759 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestListener.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef testListener_h
#define testListener_h
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
index e21f515af82..823ea799fd8 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/bug3688_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl bug3688
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
index e5bc65f9de8..9c61a834f92 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Config.h"
#include "orbsvcs/Notify_Service/Notify_Service.h"
#include "orbsvcs/CosNotifyChannelAdminC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
index 6f62f78f0c9..d1245604863 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Destroy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Notify_Test_Destroy): notifytest, etcl, iortable, dynamicany, portableserver {
exename = Notify_Tests_Destroy
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index ef176697b7e..706a5152433 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index dd9c654fe21..71bdc4d9686 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index 2da67bbaed4..ec3c8a10898 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index 6a847e4dd87..16973aee910 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 1f7f6fb57f0..76323b2cf52 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index d29d4721eb7..3b4e95cdb03 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 65ccb52dbb8..c32ac84d38e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/go.idl b/TAO/orbsvcs/tests/Notify/Discarding/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc b/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
index 3c939bb9475..2fb7ba70e5b 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
+++ b/TAO/orbsvcs/tests/Notify/Driver/Driver.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project (Notify_Test_Driver): notifytest {
exename = Notify_Tests_Driver
diff --git a/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc b/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
index cdb229fc2bb..0fca0305dff 100644
--- a/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
+++ b/TAO/orbsvcs/tests/Notify/MC/MonitorControl.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl b/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
index 86c64e05b6f..668dddd7875 100644
--- a/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
+++ b/TAO/orbsvcs/tests/Notify/MC/MonitorTestInterface.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface MonitorTestInterface
{
enum Which { NotifyService, Supplier, Consumer };
diff --git a/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
index e379acc6e91..a9c877e8d12 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
index 5989ecf4601..9765a241f0f 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
index e5efded21fa..7f7ff4f8ef2 100644
--- a/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index 921d0e673de..6f3a741ea98 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index a01418fc4e5..a29ead0cf28 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 1f9b1bb3594..57d3ca6ec8a 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index e9079f7bd8d..911bb91a96d 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 2ba2db51a86..c2240ce41d0 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index d07ecd3689c..c7356386479 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 60719e71117..e70e8c109a3 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
index 686a92add20..92042cd18f9 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 603b8e6b1a6..635d393a0ce 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 5af7cd0b8e6..efaf293783e 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 4687bc05bbd..bec30a6d1f0 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index 3ff196671a8..7529a8a8a21 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/go.idl b/TAO/orbsvcs/tests/Notify/Ordering/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
index 64f8381180d..c8053277474 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Persistent_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(supplier) : orbsvcsexe, notification, notification_skel, naming {
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
index 33f0e181f1d..40d8e014d94 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/consumer.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
index c2aca21a2c1..c0514382083 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/supplier.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Filter.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc b/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
index b33e914ab01..04a6cbf0741 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Persistent_POA.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*notify_supplier): notifytest {
exename = Structured_Supplier
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
index 4dc868c7be3..1dfc2c5ecdc 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
index 3b3f667954f..719c703cbe0 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/PlugTop.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*lib): orbsvcslib, notify_serv {
sharedname = NotifyPlugTop
dynamicflags += PLUGTOP_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
index 9e23199a111..bf53c0c9292 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_Saver.h"
#include <ace/streams.h>
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
index 4363e41b899..b6d3f2248b6 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Topology_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Test_Topology_Factory.h"
#include "Test_Saver.h"
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
index fe7fbfbee28..ff8792bd7e6 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/plugtop_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index c365a16f619..02f9125570c 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Application_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
index 40b4b622f9c..e1f9c3d1a34 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "../lib/Factories_Define.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
index 77977ac38cc..a54f3e06a7f 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: orbsvcslib, notification, rtcorba, rtportableserver, notifytest, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
sharedname = TAO_RT_NotifyTests
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 42f2427f0ba..88cda77d7ec 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_POA_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index ea665041c17..10a8b6ba093 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h b/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
index 356b8f92976..7b8bcfa8e64 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/rt_notify_test_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
index 0e4d776fe91..61ed4df3bb4 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Reconnecting.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*Supplier): notifytest {
exename = Supplier
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 651d67b3d35..d8dbce65618 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index 5d5a9e17f90..1e13f412ebf 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
avoids += ace_for_tao
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 6a993cc4634..aa51d70f020 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index d26b4e145fe..5c552723a2d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index c260d5c1bad..58472fd6579 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/OS_NS_unistd.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
index 3513a3251b9..f35b95b7166 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 63ba5eae30f..75489877c5b 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 4a5d5d1375e..432b91c5077 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 82f5e383be8..eb04571a414 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index bee0bed91cb..ca4f4218f35 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 9905c621bb1..8a4a03bb408 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "goC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 1f69fde7e44..8007cf18b4b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// A Standard simple supplier.
// All filtering is done on the consumer side.
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index bb2f59ac0a6..6d3074d443b 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 6a98b5c6eee..38a2e127f44 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Notify_Push_Supplier.h"
void
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index da41e3a9064..8fee701f753 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -1,4 +1,3 @@
-// $Id$
#ifndef NOTIFY_PUSH_SUPPLIER_H
#define NOTIFY_PUSH_SUPPLIER_H
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
index a7e74492d15..9298e0eef81 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 5534cacfb58..eab4576c4e5 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "goC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index f432e1b2e91..a1be7c03cad 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Push_Supplier.h"
#include "goS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 8b86e1cdeb2..0135a6ce722 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Test_Filter.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index decb3b34b47..ff86d67b4e7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Test_FilterFactory.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
index 5ea99aa09d5..bfef58a0550 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/Test_Filter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(TAO_RT_NotifyTests_Filter): orbsvcslib, notification_skel, notify_serv, rtcorba, etcl, dynamicany, portableserver, iortable {
sharedname = TAO_RT_NotifyTests_Filter
dynamicflags = TAO_RT_Test_Filter_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h b/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
index 055ee6f273f..33db0efd973 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/rt_test_filter_export.h
@@ -1,5 +1,4 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
index 1d9954c9368..9faa3a457e7 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
index 7c75f2e34ea..6ff370a47a3 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
index f358d6d62c5..fc060a2ffbd 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc b/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
index 4cf51f8be14..1ab3f3b7da4 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
+++ b/TAO/orbsvcs/tests/Notify/Timeout/Timeout.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(tao_*idl): taoidldefaults {
custom_only = 1
}
diff --git a/TAO/orbsvcs/tests/Notify/Timeout/sig.idl b/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
+++ b/TAO/orbsvcs/tests/Notify/Timeout/sig.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc b/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
index 1ebcf636372..1ebfe1a5ddd 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/Validate_Client.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*proxy_dummy): taoserver {
exename=proxy_dummy
Source_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
index 4e55535a11e..591774c371f 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
index 141f3252109..22e6ec1d53d 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project : orbsvcsexe, portableserver, notify_serv {
exename = main
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index afe3264bded..4f92d781e16 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Activation_Manager.h"
#include "ace/OS_NS_unistd.h"
#include "ace/os_include/os_netdb.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index d7d2f4b7575..3ebb4709a2d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Application_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 9e483b37962..96dff4a1d34 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command.h"
#include "tao/Exception.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index c3ee4624ec2..94c10a875ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command_Builder.h"
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
index 792a1cf69bb..ecb1789c077 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Command_Factory.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
index a1f7102c400..ad72f569edc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
#define TAO_Notify_Tests_COMMAND_FACTORY_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index ddb0f7ad687..f64c5988d5f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ConsumerAdmin_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 19e8d2357ac..a7bdfe5d17f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_Notify_Tests_Consumer_T_CPP
#define TAO_Notify_Tests_Consumer_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 93e07d08887..7d967fc85e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Direct_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a3dfe8a7080..e9c66c60d25 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Direct_Supplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
index 94e7f9bf7fa..09cff53f213 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Direct_Supplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index c7a89a57acf..45850fbc5e2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Driver.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 3f424e30fca..16745bb20e5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "EventChannel_Command.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
index 346d3876902..1822f47896d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Factories_Define.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 083b6711bb6..289a53b161e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Filter_Command.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 1524e8e0a3d..f78102f88ef 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "LookupManager.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index 44b649dffb7..f86ec08f39e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index 502431afa05..4ee6384ffe4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_NOTIFY_PUSHSUPPLIER_H
#define TAO_NOTIFY_PUSHSUPPLIER_H
#include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index 346a41a23e8..428172716f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Test_Client.h"
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 722f4833396..76c172dfeaa 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(NotifyTests_Lib): orbsvcslib, notification_skel, notify_serv, naming, svc_utils {
sharedname = TAO_NotifyTests
dynamicflags += TAO_NOTIFY_TEST_BUILD_DLL
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 582dce71596..42a2d0a676d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Options_Parser.h"
#include "orbsvcs/NotifyExtC.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 2012aeebbb3..fce46f2b1f9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Peer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.inl b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
index b29bbd147fb..a1bc9400b39 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Peer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index c93dd2a6af9..1e65754e8f5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_Notify_Tests_Peer_T_CPP
#define TAO_Notify_Tests_Peer_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 0f81dbae0ec..39826b3cdcb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Consumer.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index beb4edbb007..d3971798566 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Consumer_Command.h"
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index eea04d1e903..78415f88ea5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Supplier.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index a7b182245c9..893ec715baa 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Periodic_Supplier_Command.h"
#include "LookupManager.h"
#include "Name.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
index 79ca0812d95..19e60fa7c72 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Priority_Mapping.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 79ef0239bcd..9358f2326ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
index e557d6a7eda..89273d380b7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "PushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index b01c70d6913..e32616ff243 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "PushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
index 9f9bf75ff2f..4905a13fec9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "PushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index f1fbdc1589c..4e6aeca4a33 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Relay_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
index d38d4639901..7718c184a56 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "Relay_Consumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index 08e1ceff1db..a9d59c40b55 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SequencePushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
index d050292323e..fb7e92d6868 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "SequencePushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index e98fb96a64d..bdb78afc0d3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SequencePushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
index 507cd0b85c6..a973c1a69b5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "SequencePushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
index df0a5070e30..45d6bd1add4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredEvent.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index a63246fb1ed..3c47d0c1201 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredPushConsumer.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
index 24e952b7ae8..67136e10e17 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "StructuredPushConsumer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index ec7504e106f..b5ef2bfc9f6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "StructuredPushSupplier.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
index 12cb29daaef..237adce337a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.inl
@@ -1,3 +1 @@
-// $Id$
-
#include "StructuredPushSupplier.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 00bbda0d9e2..5735508d687 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "SupplierAdmin_Command.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index f7a32546bf1..6620ef54e39 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
#ifndef TAO_Notify_Tests_Supplier_T_CPP
#define TAO_Notify_Tests_Supplier_T_CPP
diff --git a/TAO/orbsvcs/tests/Notify/lib/common.cpp b/TAO/orbsvcs/tests/Notify/lib/common.cpp
index a7302904a08..08267c1047f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/common.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "common.h"
#include "orbsvcs/CosNotifyCommC.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h b/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
index 867568dfe87..d9b1856d12d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
+++ b/TAO/orbsvcs/tests/Notify/lib/notify_test_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index f9df5f787f5..0fafadb71fe 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
project(*idl): taoidldefaults, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
IDL_Files {
go.idl
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index e1654e3fead..b6ddc735664 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Sequence_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index a04c78eea3f..034893d48e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Notify_Structured_Push_Consumer.h"
#include "Notify_Test_Client.h"
#include "common.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 11b00de9bcc..b6c264876fb 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index d8b969cc3b1..09358f9d053 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index aee14a0ca01..56e3fccb7f6 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 56488818be0..84d4860bb16 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ******************************************************************
// Include Section
// ******************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
index e24bfd036c7..3848578346a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/go.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface sig
{
// Tell the server to start
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
index 619fd2e21b9..f3a8e2059be 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Perf RedGreen): notifytest {
exename = RedGreen_Test
}
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index f700eb53af7..94ee157faad 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "RedGreen_Test.h"
int
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index aff5657bd75..404f031adae 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Throughput.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
index 284e43e9fab..8fe449aaa8c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Ntf Perf Throughput): notifytest, strategies, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = Throughput
}
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index b91b329392d..f83688d2cdc 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*server): namingexe, property_serv, avoids_corba_e_micro {
exename = server
Source_Files {
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 4044d2734a0..261b126d520 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
index bbeedbc28fb..7f8fc156941 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
+++ b/TAO/orbsvcs/tests/Redundant_Naming/Redundant_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 483b787c224..ddbf902f9fc 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// ============================================================================
//
// = DESCRIPTION
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl b/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index 0667203a972..e18ea654f85 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Sched/Strategy_Scheduler.h"
#include "orbsvcs/Time_Utilities.h"
#if defined (ACE_HAS_QUANTIFY)
diff --git a/TAO/orbsvcs/tests/Sched/Sched.mpc b/TAO/orbsvcs/tests/Sched/Sched.mpc
index 1473382f007..626c30e7701 100644
--- a/TAO/orbsvcs/tests/Sched/Sched.mpc
+++ b/TAO/orbsvcs/tests/Sched/Sched.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, rtsched {
exename = Sched
}
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 8726ac155a7..d29a5967756 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program performa a simple scheduler configuration run,
// and dumps the results of one scheduling into a C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
index b6e2386a134..9bf7c0fdb33 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: namingexe, rtsched {
exename = Sched_Conf
Source_Files {
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index bf367eee839..fcaf868bf25 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program performa a simple scheduler configuration run,
// and dumps the results of one scheduling into a C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
index b221cecf8e5..1be4a63169b 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index e345717497c..55ef7703736 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
// This program exercises a run-time scheduler,
// using the config run generated C++ header file.
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
index 5b13c8e4912..73b37fffaff 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h
@@ -1,5 +1,3 @@
-// $Id$
-
// This file was automatically generated by the Scheduler_Factory.
// Before editing the file please consider generating it again.
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
index f12edc332f6..13991958b0b 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index c0fca6b8915..b52aafd103b 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 66d4d5c9ad9..ce7fd2a4524 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 6bb15414370..6eda29aac32 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
index 799be9fdcbe..d29fbb9f970 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Callback_i::Callback_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index ffd4c35b7d9..e5807c9533d 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
TX_Object.idl
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index ea411dbe319..31219471c54 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "TX_Object_i.h"
TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 7258aedbb7a..ac4b6f389cd 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TX_ObjectC.h"
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 06510884f27..44834a8ee36 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TX_Object_i.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
index f48d7df4255..717578a2c82 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Bug_1107_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
index be296431912..62c288957bd 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
index 0462946a1d4..2135a29cf6c 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "FooC.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 9bfc639bbfe..6612b8f50c0 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
index bb1644add55..754985b3b42 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Bug_2908_Regression.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
index 70735aec11e..3b1fc80dbd5 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Messenger
{
boolean send_message ( in string user_name,
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
index 90042f726e8..3a955073aa7 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "MessengerC.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index ce03557b106..4e8623a4701 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Messenger_i.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
index 8fc0d7c7767..3dc01c36a13 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
server.idl
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index a45e7478e04..01c2927159f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "serverC.h"
#include "client_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index eea77b0a2cb..a78901c9e85 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "client_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 04cbecc6590..3df90db03c0 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "server_i.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index 2b5031d8560..6bf8ec74eea 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "server_i.h"
server_i::server_i (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
index 4fe6bed7041..7204731efea 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index 48599b596a6..cc3033c6037 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 8c6c7caecfd..667b02c61a4 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 137ca4f0ec5..c7ad6c5d87d 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#if !defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
index 97524552ff4..9357ec5d99c 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc b/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
index ff9f19d2d47..76e4cff0f88 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/EndpointPolicy.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test): taoserver, endpointpolicy, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index c5eff89d754..df9c4ed4ffc 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAC.h"
#include "tao/PortableServer/POAManagerFactoryC.h"
#include "tao/EndpointPolicy/EndpointPolicy.h"
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc b/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
index 9cc76d7a701..9236c7c5cea 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/InsecureReferences.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*test): taoserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
exename = test
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 4a27792bf5d..3e18c075205 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/PortableServer/POAC.h"
#include "tao/ORB_Constants.h"
#include "ace/OS_NS_strings.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
index b9de35dbb68..38fbc74381a 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Receiver.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
index 35f2360528c..00b43a9ed7d 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Sender_i.h"
#include "ace/Manual_Event.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
index abf16e115a9..b01992447ee 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Receiver_i.h"
#include "SenderC.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
index 043ed95d566..ce5b925c9e8 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Sender_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index 0b3846e0c1b..fcc3766bfbf 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Worker.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 191000e2b2f..4e2a3155138 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index 97a07eb9c74..0d3f42a283f 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Worker.h"
Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index a819b37e393..d274c19202e 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index ab199af47fa..2e32f9cbe1a 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "test_i.h"
#include "Server_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 98af071916a..73c17a55d6d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
index 51fb274230d..f112da15a38 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 5486e50e4e6..3f01c998b92 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_Worker.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
index 865eb3ce855..9e5e77f28c9 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
test.idl
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 97a07eb9c74..0d3f42a283f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -1,4 +1,3 @@
-// $Id$
#include "Server_Worker.h"
Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 39f3fc928d8..a20b3a72666 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "Client_Worker.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index c4b03c65d19..889cb91a09e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Get_Opt.h"
#include "tao/IORTable/IORTable.h"
#include "test_i.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index ed3db5f624d..4ed9fe098cc 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "test_i.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
index 9a32e7ec527..2fe456c27c3 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
ACE_INLINE
Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc b/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
index 17cb4d65c5f..130aadc7929 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Null_Cipher.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
index 74a08a7095b..64e2e62e4bb 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index df429bfaeb2..5e4e5a88765 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 17cb4d65c5f..130aadc7929 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl) : taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index e81a2cf2f83..2647e950bc3 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "FooC.h"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 3acd85c9486..d907397ce08 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "Foo_i.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index d994462047d..3e73bea0445 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "Foo_i.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
index fecd0a02ab4..8e721949f10 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include "ace/Get_Opt.h"
#include "ace/SString.h"
#include "orbsvcs/SecurityC.h"
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
index e3c4ce4747f..b92b95e0b41 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/mixed_security.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Foo.idl
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index c35f9567dda..3db89d561de 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -1,6 +1,4 @@
// -*- C++ -*-
-// $Id$
-
#include <ace/SString.h>
#include <ace/ARGV.h>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
index a1b0a957433..1a9f0e6a240 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/ssliop_CSD.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
Messenger.idl
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
index 902b2ae0c37..9070ed3509e 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, portableserver, utils {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 059cd8a60cc..c2d7b12b54d 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Client) : namingexe, utils, portableserver {
exename = client
Source_Files {
diff --git a/TAO/orbsvcs/tests/Simple_Naming/test_object.idl b/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
index 4737f6dc6c8..d7656c28a19 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
+++ b/TAO/orbsvcs/tests/Simple_Naming/test_object.idl
@@ -1,5 +1,3 @@
-// $Id$
-
interface Test_Object
{
// = TITLE
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 2be670a4c2c..b6a9fc776d9 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Time/Time.mpc b/TAO/orbsvcs/tests/Time/Time.mpc
index 94891b66225..e3d16314757 100644
--- a/TAO/orbsvcs/tests/Time/Time.mpc
+++ b/TAO/orbsvcs/tests/Time/Time.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*orbsvcs client): namingexe, time {
exename = client
}
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 463436ae292..b5ba042c043 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Client_i.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 273e74a2f94..08a54f19bf8 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Offer_Exporter.h"
#include "ace/INET_Addr.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 0280714f872..6cd1847283d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 51551c6760e..7998cef2b78 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Offer_Importer.h"
TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index b0355182cfe..65ff201dcc6 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 86272281d1b..b7d1d806e47 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Service_Type_Exporter.h"
TAO_Service_Type_Exporter::
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index bda68c212e6..559833192f0 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index 8e20d0f6d71..fbd6b915254 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_SIMPLE_DYNAMIC_C
#define TAO_SIMPLE_DYNAMIC_C
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 2836545113f..6951cad21dd 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -1,5 +1,3 @@
-// $Id$
-
// ========================================================================
//
// = FILE
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index a5941185f59..ddc26953dba 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "TT_Info.h"
#include "orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index ae8c99133d2..eccaeed01c8 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -1,5 +1,3 @@
-// $Id$
-
#ifndef TAO_TRADER_TEST_UTILS_H
#define TAO_TRADER_TEST_UTILS_H
diff --git a/TAO/orbsvcs/tests/Trading/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index d518aa1b58f..9b6c296c98c 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -1,5 +1,3 @@
-// $Id$
-
#include <orb.idl>
module TAO_Trader_Test
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 6804b173ad0..fd8c9f58fa7 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory {
sharedname = TTest
idlflags += -I..\..\.. -I..\..\..\orbsvcs -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index ecd6c299330..7d5990210fa 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Auto_Ptr.h"
#include "ace/Get_Opt.h"
#include "tao/Utils/ORB_Manager.h"
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index fdc74792313..f786547ff6a 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Exporter.h"
#include "Offer_Importer.h"
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 0392f4620a8..86b10a73b72 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Importer.h"
diff --git a/TAO/orbsvcs/tests/Trading/ttest_export.h b/TAO/orbsvcs/tests/Trading/ttest_export.h
index 630a38f0c14..1ee37c64ad1 100644
--- a/TAO/orbsvcs/tests/Trading/ttest_export.h
+++ b/TAO/orbsvcs/tests/Trading/ttest_export.h
@@ -1,6 +1,5 @@
// -*- C++ -*-
-// $Id$
// Definition for Win32 Export directives.
// This file is generated automatically by generate_export_file.pl
// ------------------------------
diff --git a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
index 5544216a4a3..6d517a48aba 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
+++ b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl
@@ -1,5 +1,3 @@
-// $Id$
-
module corbaname
{
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
index c48d6d35b4e..27863776777 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project(*idl): taoidldefaults {
IDL_Files {
corbaname.idl
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 21c5cea5115..e3908eeba4b 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "status_i.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
index a75454ff9bb..1d7b608fce2 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: taoexe, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
exename = tests_svc_loader
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
index 98043f2ab0b..264fbd4c4d4 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "orbsvcs/Notify/MonitorControl/Control.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
index 213b273e6e9..6734bc21821 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Control
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
index 25de9255cf6..7db7625d399 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
index 426a2040b71..fc142b10caf 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc_ext {
exename = MonitorControlExt
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
index 92e195cb2ab..531f0eabcff 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Notify/MonitorControl/NotificationServiceMCC.h"
int
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
index 4e1b666f42b..ce4b0888017 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Service_Types.h"
#include "ace/Service_Config.h"
#include "ace/Service_Repository.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
index 9f3b718bb8e..9a9010291ec 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.mpc
@@ -1,4 +1,3 @@
-// $Id$
project(*server): aceexe {
exename = MonitorManager
Source_Files {
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index 1f64ae8d1a6..43c6d88e93b 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
index a44c60b4eff..f07edd0606e 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = NotificationServiceMonitor
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 4edac9d8953..d1a0548613c 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Log_Msg.h"
#include "ace/Monitor_Base.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
index 41479ef7c07..cf595a82c78 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Statistic
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
index 55d7b01f6f3..2a93578e942 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "ace/Monitor_Base.h"
#include "ace/Monitor_Point_Registry.h"
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
index 71d76943db6..40fa2b72c0c 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.mpc
@@ -1,4 +1,3 @@
-// $Id$
project: notification_mc {
exename = Statistic_Registry
}
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
index 10c97dc3c24..30510235e30 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "orbsvcs/Trader/Interpreter.h"
#include "orbsvcs/Trader/Constraint_Visitors.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
index b19d12a3bc1..211a718bb4e 100644
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc
@@ -1,6 +1,4 @@
// -*- MPC -*-
-// $Id$
-
project: trading_serv, portableserver {
exename = Interpreter
}